X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsyncableobject.cpp;h=3a1799e2883a88db5f4bb41a4e979eaf84f8be52;hp=3d058caa808f7137729174cca9fa6f5b17589786;hb=4259bc3c5b11164245535e011a69efa6937bb6a6;hpb=f13ee12590d103b3512ba74c0bef3b0817c4c947

diff --git a/src/common/syncableobject.cpp b/src/common/syncableobject.cpp
index 3d058caa..3a1799e2 100644
--- a/src/common/syncableobject.cpp
+++ b/src/common/syncableobject.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -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;
     }
@@ -141,18 +141,18 @@ void SyncableObject::fromVariantMap(const QVariantMap &properties)
     while (iterator != properties.constEnd()) {
         propName = iterator.key();
         if (propName == "objectName") {
-            iterator++;
+            ++iterator;
             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++;
+        ++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);
 }