QT/pyotherside
1
0
Fork 0
mirror of https://github.com/thp/pyotherside.git synced 2025-02-05 08:08:23 +08:00
Code Issues Projects Releases Wiki Activity

Fixed compile errors after last Qt 5.4 patch

Browse Source
This commit is contained in:
GreenAddress 2014-11-11 11:32:21 +01:00
parent dc94842773
commit a113f51db4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/converter.h
View File

@ -109,7 +109,7 @@ class Converter {
QOBJECT,
};
virtual enum Type type(V&) = 0;
virtual enum Type type(const V&) = 0;
virtual long long integer(V&) = 0;
virtual double floating(V&) = 0;
virtual bool boolean(V&) = 0;

2
src/pyobject_converter.h
View File

@ -139,7 +139,7 @@ class PyObjectConverter : public Converter<PyObject *> {
}
}
virtual enum Type type(PyObject *&o) {
virtual enum Type type(PyObject * const & o) {
if (PyObject_TypeCheck(o, &pyotherside_QObjectType)) {
return QOBJECT;
} else if (PyObject_TypeCheck(o, &pyotherside_QObjectMethodType)) {

8
src/qvariant_converter.h
View File

@ -66,7 +66,7 @@ class QVariantDictBuilder : public DictBuilder<QVariant> {
class QVariantListIterator : public ListIterator<QVariant> {
public:
QVariantListIterator(QVariant &v) : list(v.toList()), pos(0) {}
QVariantListIterator(const QVariant &v) : list(v.toList()), pos(0) {}
virtual ~QVariantListIterator() {}
virtual bool next(QVariant *v) {
@ -87,7 +87,7 @@ class QVariantListIterator : public ListIterator<QVariant> {
class QVariantDictIterator : public DictIterator<QVariant> {
public:
QVariantDictIterator(QVariant &v) : dict(v.toMap()), keys(dict.keys()), pos(0) {}
QVariantDictIterator(const QVariant &v) : dict(v.toMap()), keys(dict.keys()), pos(0) {}
virtual ~QVariantDictIterator() {}
virtual bool next(QVariant *key, QVariant *value) {
@ -114,7 +114,7 @@ class QVariantConverter : public Converter<QVariant> {
QVariantConverter() : stringstorage() {}
virtual ~QVariantConverter() {}
virtual enum Type type(QVariant &v) {
virtual enum Type type(const QVariant &v) {
if (v.canConvert<QObject *>()) {
return QOBJECT;
}
@ -170,7 +170,7 @@ class QVariantConverter : public Converter<QVariant> {
virtual DictIterator<QVariant> *dict(QVariant &v) {
// XXX: Until we support boxing QJSValue objects directly in Python
if (v.userType() == qMetaTypeId<QJSValue>()) {
return new QVariantListIterator(v.value<QJSValue>().toVariant());
return new QVariantDictIterator(v.value<QJSValue>().toVariant());
}
return new QVariantDictIterator(v);
}