From a84bc37219a5be3598885e80274c521ef7184ccb Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 10 Jun 2019 01:37:38 +0000 Subject: [PATCH] various cleanups Signed-off-by: Ivailo Monev --- src/core/plugin/qlibrary_p.h | 9 +++++-- src/gui/image/qpixmapfilter.cpp | 5 ++-- src/gui/kernel/qlayoutengine.cpp | 2 +- src/script/bridge/qscriptdeclarativeclass.cpp | 16 +++++------ src/script/bridge/qscriptvariant.cpp | 38 +++++++++++---------------- 5 files changed, 34 insertions(+), 36 deletions(-) diff --git a/src/core/plugin/qlibrary_p.h b/src/core/plugin/qlibrary_p.h index d51e5aa97..a71d3ad8c 100644 --- a/src/core/plugin/qlibrary_p.h +++ b/src/core/plugin/qlibrary_p.h @@ -61,7 +61,8 @@ class QLibraryPrivate public: void *pHnd; - QString fileName, qualifiedFileName; + QString fileName; + QString qualifiedFileName; QString fullVersion; bool load(); @@ -94,7 +95,11 @@ private: QAtomicInt libraryRefCount; QAtomicInt libraryUnloadCount; - enum {IsAPlugin, IsNotAPlugin, MightBeAPlugin } pluginState; + enum { + IsAPlugin, + IsNotAPlugin, + MightBeAPlugin + } pluginState; }; QT_END_NAMESPACE diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp index 0b3a9f595..af56a94c0 100644 --- a/src/gui/image/qpixmapfilter.cpp +++ b/src/gui/image/qpixmapfilter.cpp @@ -1022,9 +1022,8 @@ class QPixmapColorizeFilterPrivate : public QPixmapFilterPrivate public: QColor color; qreal strength; - quint32 opaque : 1; - quint32 alphaBlend : 1; - quint32 padding : 30; + quint32 opaque; + quint32 alphaBlend ; }; /*! diff --git a/src/gui/kernel/qlayoutengine.cpp b/src/gui/kernel/qlayoutengine.cpp index 0d9e74e81..caa4773b6 100644 --- a/src/gui/kernel/qlayoutengine.cpp +++ b/src/gui/kernel/qlayoutengine.cpp @@ -404,7 +404,7 @@ Q_GUI_EXPORT int qSmartSpacing(const QLayout *layout, QStyle::PixelMetric pm) return -1; } else if (parent->isWidgetType()) { QWidget *pw = static_cast(parent); - return pw->style()->pixelMetric(pm, 0, pw); + return pw->style()->pixelMetric(pm, Q_NULLPTR, pw); } else { return static_cast(parent)->spacing(); } diff --git a/src/script/bridge/qscriptdeclarativeclass.cpp b/src/script/bridge/qscriptdeclarativeclass.cpp index e2c417ae2..0ca3af86e 100644 --- a/src/script/bridge/qscriptdeclarativeclass.cpp +++ b/src/script/bridge/qscriptdeclarativeclass.cpp @@ -251,12 +251,12 @@ QScriptValue QScriptDeclarativeClass::function(const QScriptValue &v, const Iden QScript::APIShim shim(d->engine); JSC::ExecState *exec = d->engine->currentFrame; JSC::JSObject *object = d->jscValue.getObject(); - JSC::PropertySlot slot(const_cast(object)); + JSC::PropertySlot slot(object); JSC::JSValue result; JSC::Identifier id(exec, (JSC::UString::Rep *)name); - if (const_cast(object)->getOwnPropertySlot(exec, id, slot)) { + if (object->getOwnPropertySlot(exec, id, slot)) { result = slot.getValue(exec, id); if (QScript::isFunction(result)) return d->engine->scriptValueFromJSCValue(result); @@ -275,12 +275,12 @@ QScriptValue QScriptDeclarativeClass::property(const QScriptValue &v, const Iden QScript::APIShim shim(d->engine); JSC::ExecState *exec = d->engine->currentFrame; JSC::JSObject *object = d->jscValue.getObject(); - JSC::PropertySlot slot(const_cast(object)); + JSC::PropertySlot slot(object); JSC::JSValue result; JSC::Identifier id(exec, (JSC::UString::Rep *)name); - if (const_cast(object)->getOwnPropertySlot(exec, id, slot)) { + if (object->getOwnPropertySlot(exec, id, slot)) { result = slot.getValue(exec, id); return d->engine->scriptValueFromJSCValue(result); } @@ -299,12 +299,12 @@ QScriptDeclarativeClass::functionValue(const QScriptValue &v, const Identifier & QScript::APIShim shim(d->engine); JSC::ExecState *exec = d->engine->currentFrame; JSC::JSObject *object = d->jscValue.getObject(); - JSC::PropertySlot slot(const_cast(object)); + JSC::PropertySlot slot(object); JSC::JSValue result; JSC::Identifier id(exec, (JSC::UString::Rep *)name); - if (const_cast(object)->getOwnPropertySlot(exec, id, slot)) { + if (object->getOwnPropertySlot(exec, id, slot)) { result = slot.getValue(exec, id); if (QScript::isFunction(result)) return jscToValue(result); @@ -324,12 +324,12 @@ QScriptDeclarativeClass::propertyValue(const QScriptValue &v, const Identifier & QScript::APIShim shim(d->engine); JSC::ExecState *exec = d->engine->currentFrame; JSC::JSObject *object = d->jscValue.getObject(); - JSC::PropertySlot slot(const_cast(object)); + JSC::PropertySlot slot(object); JSC::JSValue result; JSC::Identifier id(exec, (JSC::UString::Rep *)name); - if (const_cast(object)->getOwnPropertySlot(exec, id, slot)) { + if (object->getOwnPropertySlot(exec, id, slot)) { result = slot.getValue(exec, id); return jscToValue(result); } diff --git a/src/script/bridge/qscriptvariant.cpp b/src/script/bridge/qscriptvariant.cpp index 2239c4dc4..972da267b 100644 --- a/src/script/bridge/qscriptvariant.cpp +++ b/src/script/bridge/qscriptvariant.cpp @@ -79,28 +79,22 @@ static JSC::JSValue QT_FASTCALL variantProtoFuncValueOf(JSC::ExecState *exec, JS return throwError(exec, JSC::TypeError); const QVariant &v = static_cast(delegate)->value(); switch (v.type()) { - case QVariant::Invalid: - return JSC::jsUndefined(); - case QVariant::String: - return JSC::jsString(exec, v.toString()); - - case QVariant::Int: - return JSC::jsNumber(exec, v.toInt()); - - case QVariant::Bool: - return JSC::jsBoolean(v.toBool()); - - case QVariant::Double: - return JSC::jsNumber(exec, v.toDouble()); - -// case QVariant::Char: -// return JSC::jsNumber(exec, v.toChar().unicode()); - - case QVariant::UInt: - return JSC::jsNumber(exec, v.toUInt()); - - default: - ; + case QVariant::Invalid: + return JSC::jsUndefined(); + case QVariant::String: + return JSC::jsString(exec, v.toString()); + case QVariant::Int: + return JSC::jsNumber(exec, v.toInt()); + case QVariant::Bool: + return JSC::jsBoolean(v.toBool()); + case QVariant::Double: + return JSC::jsNumber(exec, v.toDouble()); + // case QVariant::Char: + // return JSC::jsNumber(exec, v.toChar().unicode()); + case QVariant::UInt: + return JSC::jsNumber(exec, v.toUInt()); + default: + ; } return thisValue; } -- 2.11.0