projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added SignalProxy::isSecure() to determine if all connections are secure (ssl encrypt...
[quassel.git]
/
src
/
common
/
syncableobject.cpp
diff --git
a/src/common/syncableobject.cpp
b/src/common/syncableobject.cpp
index
ebe6ca0
..
ec34708
100644
(file)
--- a/
src/common/syncableobject.cpp
+++ b/
src/common/syncableobject.cpp
@@
-34,6
+34,14
@@
SyncableObject::SyncableObject(QObject *parent)
{
}
{
}
+SyncableObject::SyncableObject(const QString &objectName, QObject *parent)
+ : QObject(parent),
+ _initialized(false),
+ _allowClientUpdates(false)
+{
+ setObjectName(objectName);
+}
+
SyncableObject::SyncableObject(const SyncableObject &other, QObject *parent)
: QObject(parent),
_initialized(other._initialized),
SyncableObject::SyncableObject(const SyncableObject &other, QObject *parent)
: QObject(parent),
_initialized(other._initialized),
@@
-44,7
+52,7
@@
SyncableObject::SyncableObject(const SyncableObject &other, QObject *parent)
SyncableObject &SyncableObject::operator=(const SyncableObject &other) {
if(this == &other)
return *this;
SyncableObject &SyncableObject::operator=(const SyncableObject &other) {
if(this == &other)
return *this;
-
+
_initialized = other._initialized;
_allowClientUpdates = other._allowClientUpdates;
return *this;
_initialized = other._initialized;
_allowClientUpdates = other._allowClientUpdates;
return *this;
@@
-92,7
+100,6
@@
QVariantMap SyncableObject::toVariantMap() {
QMetaObject::invokeMethod(this, methodname.toAscii(), genericvalue);
properties[SignalProxy::methodBaseName(method)] = value;
QMetaObject::invokeMethod(this, methodname.toAscii(), genericvalue);
properties[SignalProxy::methodBaseName(method)] = value;
- // qDebug() << ">>> SYNC:" << methodBaseName(method) << value;
}
// properties["Payload"] = QByteArray(10000000, 'a'); // for testing purposes
return properties;
}
// properties["Payload"] = QByteArray(10000000, 'a'); // for testing purposes
return properties;
@@
-110,7
+117,7
@@
void SyncableObject::fromVariantMap(const QVariantMap &properties) {
iterator++;
continue;
}
iterator++;
continue;
}
-
+
int propertyIndex = meta->indexOfProperty(propName.toAscii());
if(propertyIndex == -1 || !meta->property(propertyIndex).isWritable())
int propertyIndex = meta->indexOfProperty(propName.toAscii());
if(propertyIndex == -1 || !meta->property(propertyIndex).isWritable())