X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsyncableobject.cpp;h=0a142037bfcb645cd152f3ce52a3a018a5b984c7;hp=3d058caa808f7137729174cca9fa6f5b17589786;hb=40601ae070413b727a68e35e5b8c619176c661b1;hpb=73b7e9b2e6b0742e344238c6ebac05919efd914b diff --git a/src/common/syncableobject.cpp b/src/common/syncableobject.cpp index 3d058caa..0a142037 100644 --- a/src/common/syncableobject.cpp +++ b/src/common/syncableobject.cpp @@ -124,7 +124,7 @@ QVariantMap SyncableObject::toVariantMap() QVariant value(variantType, (const void *)0); QGenericReturnArgument genericvalue = QGenericReturnArgument(method.typeName(), value.data()); - QMetaObject::invokeMethod(this, methodname.toAscii(), genericvalue); + QMetaObject::invokeMethod(this, methodname.toLatin1(), genericvalue); properties[SignalProxy::ExtendedMetaObject::methodBaseName(method)] = value; } @@ -145,12 +145,12 @@ void SyncableObject::fromVariantMap(const QVariantMap &properties) continue; } - int propertyIndex = meta->indexOfProperty(propName.toAscii()); + int propertyIndex = meta->indexOfProperty(propName.toLatin1()); if (propertyIndex == -1 || !meta->property(propertyIndex).isWritable()) setInitValue(propName, iterator.value()); else - setProperty(propName.toAscii(), iterator.value()); + setProperty(propName.toLatin1(), iterator.value()); // qDebug() << "<<< SYNC:" << name << iterator.value(); iterator++; } @@ -163,9 +163,9 @@ bool SyncableObject::setInitValue(const QString &property, const QVariant &value handlername[7] = handlername[7].toUpper(); QString methodSignature = QString("%1(%2)").arg(handlername).arg(value.typeName()); - int methodIdx = metaObject()->indexOfMethod(methodSignature.toAscii().constData()); + int methodIdx = metaObject()->indexOfMethod(methodSignature.toLatin1().constData()); if (methodIdx < 0) { - QByteArray normedMethodName = QMetaObject::normalizedSignature(methodSignature.toAscii().constData()); + QByteArray normedMethodName = QMetaObject::normalizedSignature(methodSignature.toLatin1().constData()); methodIdx = metaObject()->indexOfMethod(normedMethodName.constData()); } if (methodIdx < 0) { @@ -173,7 +173,7 @@ bool SyncableObject::setInitValue(const QString &property, const QVariant &value } QGenericArgument param(value.typeName(), value.constData()); - return QMetaObject::invokeMethod(this, handlername.toAscii(), param); + return QMetaObject::invokeMethod(this, handlername.toLatin1(), param); }