Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdeclarative: rename image binding function

Browse source 
partially fixes build when CMAKE_UNITY_BUILD is set to ON

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-06-11 18:41:48 +03:00
parent f681ac0588
commit 7ddc53d4c1
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
kdeclarative/bindings/icon.cpp
View file

@ -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);

6
kdeclarative/bindings/image.cpp
View file

@ -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);