projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sigproxy: Don't expose the thread_local '_current' attribute
[quassel.git]
/
src
/
common
/
syncableobject.cpp
diff --git
a/src/common/syncableobject.cpp
b/src/common/syncableobject.cpp
index
b4f395f
..
9394659
100644
(file)
--- a/
src/common/syncableobject.cpp
+++ b/
src/common/syncableobject.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
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,7
+27,6
@@
#include "signalproxy.h"
#include "util.h"
#include "signalproxy.h"
#include "util.h"
-INIT_SYNCABLE_OBJECT(SyncableObject)
SyncableObject::SyncableObject(QObject *parent)
: QObject(parent),
_initialized(false),
SyncableObject::SyncableObject(QObject *parent)
: QObject(parent),
_initialized(false),
@@
-114,11
+113,7
@@
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()) {
-#if QT_VERSION >= 0x050000
qWarning() << "SyncableObject::toVariantMap(): cannot fetch init data for:" << this << method.methodSignature() << "- Returntype is unknown to Qt's MetaSystem:" << QByteArray(method.typeName());
qWarning() << "SyncableObject::toVariantMap(): cannot fetch init data for:" << this << method.methodSignature() << "- Returntype is unknown to Qt's MetaSystem:" << QByteArray(method.typeName());
-#else
- qWarning() << "SyncableObject::toVariantMap(): cannot fetch init data for:" << this << method.signature() << "- Returntype is unknown to Qt's MetaSystem:" << QByteArray(method.typeName());
-#endif
continue;
}
continue;
}
@@
-141,7
+136,7
@@
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;
}
@@
-152,7
+147,7
@@
void SyncableObject::fromVariantMap(const QVariantMap &properties)
else
setProperty(propName.toLatin1(), iterator.value());
// qDebug() << "<<< SYNC:" << name << iterator.value();
else
setProperty(propName.toLatin1(), iterator.value());
// qDebug() << "<<< SYNC:" << name << iterator.value();
-
iterator++
;
+
++iterator
;
}
}
}
}