projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use '= default' instead of empty ctor/dtor bodies
[quassel.git]
/
src
/
common
/
syncableobject.cpp
diff --git
a/src/common/syncableobject.cpp
b/src/common/syncableobject.cpp
index
a9417b1
..
f43a155
100644
(file)
--- a/
src/common/syncableobject.cpp
+++ b/
src/common/syncableobject.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
2
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-27,19
+27,14
@@
#include "signalproxy.h"
#include "util.h"
#include "signalproxy.h"
#include "util.h"
-INIT_SYNCABLE_OBJECT(SyncableObject)
SyncableObject::SyncableObject(QObject *parent)
SyncableObject::SyncableObject(QObject *parent)
- : QObject(parent),
- _initialized(false),
- _allowClientUpdates(false)
+ : QObject(parent)
{
}
SyncableObject::SyncableObject(const QString &objectName, QObject *parent)
{
}
SyncableObject::SyncableObject(const QString &objectName, QObject *parent)
- : QObject(parent),
- _initialized(false),
- _allowClientUpdates(false)
+ : QObject(parent)
{
setObjectName(objectName);
}
{
setObjectName(objectName);
}
@@
-114,13
+109,13
@@
QVariantMap SyncableObject::toVariantMap()
QVariant::Type variantType = QVariant::nameToType(method.typeName());
if (variantType == QVariant::Invalid && !QByteArray(method.typeName()).isEmpty()) {
QVariant::Type variantType = QVariant::nameToType(method.typeName());
if (variantType == QVariant::Invalid && !QByteArray(method.typeName()).isEmpty()) {
- qWarning() << "SyncableObject::toVariantMap(): cannot fetch init data for:" << this << method.
s
ignature() << "- Returntype is unknown to Qt's MetaSystem:" << QByteArray(method.typeName());
+ qWarning() << "SyncableObject::toVariantMap(): cannot fetch init data for:" << this << method.
methodS
ignature() << "- Returntype is unknown to Qt's MetaSystem:" << QByteArray(method.typeName());
continue;
}
continue;
}
- QVariant value(variantType, (const void *)
0
);
+ QVariant value(variantType, (const void *)
nullptr
);
QGenericReturnArgument genericvalue = QGenericReturnArgument(method.typeName(), value.data());
QGenericReturnArgument genericvalue = QGenericReturnArgument(method.typeName(), value.data());
- QMetaObject::invokeMethod(this, methodname.to
Ascii
(), genericvalue);
+ QMetaObject::invokeMethod(this, methodname.to
Latin1
(), genericvalue);
properties[SignalProxy::ExtendedMetaObject::methodBaseName(method)] = value;
}
properties[SignalProxy::ExtendedMetaObject::methodBaseName(method)] = value;
}
@@
-137,18
+132,18
@@
void SyncableObject::fromVariantMap(const QVariantMap &properties)
while (iterator != properties.constEnd()) {
propName = iterator.key();
if (propName == "objectName") {
while (iterator != properties.constEnd()) {
propName = iterator.key();
if (propName == "objectName") {
-
iterator++
;
+
++iterator
;
continue;
}
continue;
}
- int propertyIndex = meta->indexOfProperty(propName.to
Ascii
());
+ int propertyIndex = meta->indexOfProperty(propName.to
Latin1
());
if (propertyIndex == -1 || !meta->property(propertyIndex).isWritable())
setInitValue(propName, iterator.value());
else
if (propertyIndex == -1 || !meta->property(propertyIndex).isWritable())
setInitValue(propName, iterator.value());
else
- setProperty(propName.to
Ascii
(), iterator.value());
+ setProperty(propName.to
Latin1
(), iterator.value());
// qDebug() << "<<< SYNC:" << name << iterator.value();
// qDebug() << "<<< SYNC:" << name << iterator.value();
-
iterator++
;
+
++iterator
;
}
}
}
}
@@
-159,9
+154,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());
handlername[7] = handlername[7].toUpper();
QString methodSignature = QString("%1(%2)").arg(handlername).arg(value.typeName());
- int methodIdx = metaObject()->indexOfMethod(methodSignature.to
Ascii
().constData());
+ int methodIdx = metaObject()->indexOfMethod(methodSignature.to
Latin1
().constData());
if (methodIdx < 0) {
if (methodIdx < 0) {
- QByteArray normedMethodName = QMetaObject::normalizedSignature(methodSignature.to
Ascii
().constData());
+ QByteArray normedMethodName = QMetaObject::normalizedSignature(methodSignature.to
Latin1
().constData());
methodIdx = metaObject()->indexOfMethod(normedMethodName.constData());
}
if (methodIdx < 0) {
methodIdx = metaObject()->indexOfMethod(normedMethodName.constData());
}
if (methodIdx < 0) {
@@
-169,7
+164,7
@@
bool SyncableObject::setInitValue(const QString &property, const QVariant &value
}
QGenericArgument param(value.typeName(), value.constData());
}
QGenericArgument param(value.typeName(), value.constData());
- return QMetaObject::invokeMethod(this, handlername.to
Ascii
(), param);
+ return QMetaObject::invokeMethod(this, handlername.to
Latin1
(), param);
}
}