From 7ddc53d4c1566bc193225af633aed5c7c208b23f Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 11 Jun 2023 18:41:48 +0300 Subject: [PATCH] kdeclarative: rename image binding function partially fixes build when CMAKE_UNITY_BUILD is set to ON Signed-off-by: Ivailo Monev --- kdeclarative/bindings/icon.cpp | 14 +++++++------- kdeclarative/bindings/image.cpp | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kdeclarative/bindings/icon.cpp b/kdeclarative/bindings/icon.cpp index 1f1648ac..e93c631b 100644 --- a/kdeclarative/bindings/icon.cpp +++ b/kdeclarative/bindings/icon.cpp @@ -47,7 +47,7 @@ static QScriptValue iconCtor(QScriptContext *ctx, QScriptEngine *eng) return qScriptValueFromValue(eng, QIcon()); } -static QScriptValue addPixmap(QScriptContext *ctx, QScriptEngine *eng) +static QScriptValue iconAddPixmap(QScriptContext *ctx, QScriptEngine *eng) { DECLARE_SELF(QIcon, addPixmap); @@ -66,7 +66,7 @@ static QScriptValue addPixmap(QScriptContext *ctx, QScriptEngine *eng) return eng->undefinedValue(); } -static QScriptValue addFile(QScriptContext *ctx, QScriptEngine *eng) +static QScriptValue iconAddFile(QScriptContext *ctx, QScriptEngine *eng) { DECLARE_SELF(QIcon, addFile); @@ -81,10 +81,10 @@ static QScriptValue addFile(QScriptContext *ctx, QScriptEngine *eng) return eng->undefinedValue(); } -static QScriptValue isNull(QScriptContext *ctx, QScriptEngine *eng) +static QScriptValue iconIsNull(QScriptContext *ctx, QScriptEngine *eng) { Q_UNUSED(eng) - DECLARE_SELF(QIcon, isNull); + DECLARE_SELF(QIcon, null); return self->isNull(); } @@ -93,9 +93,9 @@ QScriptValue constructIconClass(QScriptEngine *eng) QScriptValue proto = qScriptValueFromValue(eng, QIcon()); QScriptValue::PropertyFlags getter = QScriptValue::PropertyGetter; // QScriptValue::PropertyFlags setter = QScriptValue::PropertySetter; - proto.setProperty("addPixmap", eng->newFunction(addPixmap)); - proto.setProperty("addFile", eng->newFunction(addFile)); - proto.setProperty("null", eng->newFunction(isNull), getter); + proto.setProperty("addPixmap", eng->newFunction(iconAddPixmap)); + proto.setProperty("addFile", eng->newFunction(iconAddFile)); + proto.setProperty("null", eng->newFunction(iconIsNull), getter); QScriptValue ctorFun = eng->newFunction(iconCtor, proto); ADD_ENUM_VALUE(ctorFun, QIcon, Normal); diff --git a/kdeclarative/bindings/image.cpp b/kdeclarative/bindings/image.cpp index 6a76d102..5bc3c33d 100644 --- a/kdeclarative/bindings/image.cpp +++ b/kdeclarative/bindings/image.cpp @@ -47,10 +47,10 @@ static QScriptValue imageCtor(QScriptContext *ctx, QScriptEngine *eng) return qScriptValueFromValue(eng, QImage()); } -static QScriptValue isNull(QScriptContext *ctx, QScriptEngine *eng) +static QScriptValue imageIsNull(QScriptContext *ctx, QScriptEngine *eng) { Q_UNUSED(eng) - DECLARE_SELF(QImage, isNull); + DECLARE_SELF(QImage, null); return self->isNull(); } @@ -59,7 +59,7 @@ QScriptValue constructImageClass(QScriptEngine *eng) QScriptValue proto = qScriptValueFromValue(eng, QImage()); QScriptValue::PropertyFlags getter = QScriptValue::PropertyGetter; // QScriptValue::PropertyFlags setter = QScriptValue::PropertySetter; - proto.setProperty("null", eng->newFunction(isNull), getter); + proto.setProperty("null", eng->newFunction(imageIsNull), getter); QScriptValue ctorFun = eng->newFunction(imageCtor, proto);