Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 10:22:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove qml leftovers

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-10-21 09:11:28 +03:00
parent 770f63fa3b
commit 84dde53fd8
13 changed files with 51 additions and 364 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -480,11 +480,6 @@ katie_generate_obsolete(QDBusPendingCallWatcher QtDBus qdbuspendingcall.h)
katie_generate_obsolete(QDBusPendingReplyData QtDBus qdbuspendingreply.h)
katie_generate_obsolete(QDBusSignature QtDBus qdbusextratypes.h)
katie_generate_obsolete(QDBusVariant QtDBus qdbusextratypes.h)
katie_generate_obsolete(QDeclarativeAttachedPropertiesFunc QtDeclarative qdeclarativeprivate.h)
katie_generate_obsolete(QDeclarativeListProperty QtDeclarative qdeclarativelist.h)
katie_generate_obsolete(QDeclarativeListReference QtDeclarative qdeclarativelist.h)
katie_generate_obsolete(QDeclarativeProperties QtDeclarative qdeclarativeproperty.h)
katie_generate_obsolete(QDeclarativeTypeInfo QtDeclarative qdeclarativeprivate.h)
katie_generate_obsolete(QDomAttr QtXml qdom.h)
katie_generate_obsolete(QDomCDATASection QtXml qdom.h)
katie_generate_obsolete(QDomCharacterData QtXml qdom.h)

1
cmake/dbg.sh.cmake
View file

@ -8,7 +8,6 @@ else
export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib:$LD_LIBRARY_PATH"
fi
export QT_PLUGIN_PATH="@CMAKE_BINARY_DIR@/plugins"
export QML_IMPORT_PATH="@CMAKE_BINARY_DIR@/imports"
bin="$1"
shift

1
cmake/exec.sh.cmake
View file

@ -8,7 +8,6 @@ else
export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib:$LD_LIBRARY_PATH"
fi
export QT_PLUGIN_PATH="@CMAKE_BINARY_DIR@/plugins"
export QML_IMPORT_PATH="@CMAKE_BINARY_DIR@/imports"
bin="$1"
shift

92
src/gui/animation/qvariantanimation.cpp
View file

@ -177,6 +177,52 @@ template<> Q_INLINE_TEMPLATE QColor _q_interpolate(const QColor &f,const QColor
qBound(0,_q_interpolate(f.alpha(), t.alpha(), progress),255));
}
static QVariantAnimation::Interpolator getInterpolator(int interpolationType)
{
switch(QMetaType::Type(interpolationType)) {
case QMetaType::Int:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<int>);
case QMetaType::UInt:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<uint>);
case QMetaType::Double:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<double>);
case QMetaType::Float:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<float>);
case QMetaType::QLine:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QLine>);
case QMetaType::QLineF:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QLineF>);
case QMetaType::QPoint:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QPoint>);
case QMetaType::QPointF:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QPointF>);
case QMetaType::QSize:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QSize>);
case QMetaType::QSizeF:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QSizeF>);
case QMetaType::QRect:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QRect>);
case QMetaType::QRectF:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QRectF>);
case QMetaType::QColor:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QColor>);
#ifndef QT_NO_VECTOR2D
case QMetaType::QVector2D:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QVector2D>);
#endif // QT_NO_VECTOR2D
#ifndef QT_NO_VECTOR3D
case QMetaType::QVector3D:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QVector3D>);
#endif // QT_NO_VECTOR3D
#ifndef QT_NO_VECTOR4D
case QMetaType::QVector4D:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QVector4D>);
#endif // QT_NO_VECTOR4D
default:
return nullptr; //this type is not handled
}
}
QVariantAnimationPrivate::QVariantAnimationPrivate()
: duration(250), interpolator(&defaultInterpolator)
{
@ -401,52 +447,6 @@ void QVariantAnimation::setEasingCurve(const QEasingCurve &easing)
*/
QVariantAnimation::Interpolator QVariantAnimationPrivate::getInterpolator(int interpolationType)
{
switch(QMetaType::Type(interpolationType)) {
case QMetaType::Int:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<int>);
case QMetaType::UInt:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<uint>);
case QMetaType::Double:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<double>);
case QMetaType::Float:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<float>);
case QMetaType::QLine:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QLine>);
case QMetaType::QLineF:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QLineF>);
case QMetaType::QPoint:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QPoint>);
case QMetaType::QPointF:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QPointF>);
case QMetaType::QSize:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QSize>);
case QMetaType::QSizeF:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QSizeF>);
case QMetaType::QRect:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QRect>);
case QMetaType::QRectF:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QRectF>);
case QMetaType::QColor:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QColor>);
#ifndef QT_NO_VECTOR2D
case QMetaType::QVector2D:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QVector2D>);
#endif // QT_NO_VECTOR2D
#ifndef QT_NO_VECTOR3D
case QMetaType::QVector3D:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QVector3D>);
#endif // QT_NO_VECTOR3D
#ifndef QT_NO_VECTOR4D
case QMetaType::QVector4D:
return reinterpret_cast<QVariantAnimation::Interpolator>(_q_interpolateVariant<QVector4D>);
#endif // QT_NO_VECTOR4D
default:
return nullptr; //this type is not handled
}
}
/*!
\property QVariantAnimation::duration
\brief the duration of the animation

3
src/gui/animation/qvariantanimation_p.h
View file

@ -79,9 +79,6 @@ public:
void convertValues(int t);
void updateInterpolator();
// this is needed by declarative animations
static Q_GUI_EXPORT QVariantAnimation::Interpolator getInterpolator(int interpolationType);
};
QT_END_NAMESPACE

155
src/gui/graphicsview/qgraphicsitem.cpp
View file

@ -6978,7 +6978,6 @@ void QGraphicsItem::prepareGeometryChange()
d_ptr->scene->d_func()->dirtyGrowingItemsBoundingRect = true;
d_ptr->geometryChanged = true;
d_ptr->paintedViewBoundingRectsNeedRepaint = true;
d_ptr->notifyBoundingRectChanged = !d_ptr->inSetPosHelper;
QGraphicsScenePrivate *scenePrivate = d_ptr->scene->d_func();
scenePrivate->index->prepareBoundingRectChange(this);
@ -7107,142 +7106,6 @@ QGraphicsObject::QGraphicsObject(QGraphicsItemPrivate &dd, QGraphicsItem *parent
QGraphicsItem::d_ptr->isObject = true;
}
void QGraphicsItemPrivate::children_append(QDeclarativeListProperty<QGraphicsObject> *list, QGraphicsObject *item)
{
if (item) {
QGraphicsObject *graphicsObject = static_cast<QGraphicsObject *>(list->object);
if (QGraphicsItemPrivate::get(graphicsObject)->sendParentChangeNotification) {
item->setParentItem(graphicsObject);
} else {
QGraphicsItemPrivate::get(item)->setParentItemHelper(graphicsObject, 0, 0);
}
}
}
int QGraphicsItemPrivate::children_count(QDeclarativeListProperty<QGraphicsObject> *list)
{
QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(static_cast<QGraphicsObject *>(list->object));
return d->children.count();
}
QGraphicsObject *QGraphicsItemPrivate::children_at(QDeclarativeListProperty<QGraphicsObject> *list, int index)
{
QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(static_cast<QGraphicsObject *>(list->object));
if (index >= 0 && index < d->children.count())
return d->children.at(index)->toGraphicsObject();
else
return 0;
}
void QGraphicsItemPrivate::children_clear(QDeclarativeListProperty<QGraphicsObject> *list)
{
QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(static_cast<QGraphicsObject *>(list->object));
int childCount = d->children.count();
if (d->sendParentChangeNotification) {
for (int index = 0; index < childCount; index++)
d->children.at(0)->setParentItem(0);
} else {
for (int index = 0; index < childCount; index++)
QGraphicsItemPrivate::get(d->children.at(0))->setParentItemHelper(0, 0, 0);
}
}
/*!
Returns a list of this item's children.
The items are sorted by stacking order. This takes into account both the
items' insertion order and their Z-values.
*/
QDeclarativeListProperty<QGraphicsObject> QGraphicsItemPrivate::childrenList()
{
Q_Q(QGraphicsItem);
if (isObject) {
QGraphicsObject *that = static_cast<QGraphicsObject *>(q);
return QDeclarativeListProperty<QGraphicsObject>(that, &children, children_append,
children_count, children_at, children_clear);
} else {
//QGraphicsItem is not supported for this property
return QDeclarativeListProperty<QGraphicsObject>();
}
}
/*!
\internal
Returns the width of the item
Reimplemented by QGraphicsWidget
*/
qreal QGraphicsItemPrivate::width() const
{
return 0;
}
/*!
\internal
Set the width of the item
Reimplemented by QGraphicsWidget
*/
void QGraphicsItemPrivate::setWidth(qreal w)
{
Q_UNUSED(w);
}
/*!
\internal
Reset the width of the item
Reimplemented by QGraphicsWidget
*/
void QGraphicsItemPrivate::resetWidth()
{
}
/*!
\internal
Returns the height of the item
Reimplemented by QGraphicsWidget
*/
qreal QGraphicsItemPrivate::height() const
{
return 0;
}
/*!
\internal
Set the height of the item
Reimplemented by QGraphicsWidget
*/
void QGraphicsItemPrivate::setHeight(qreal h)
{
Q_UNUSED(h);
}
/*!
\internal
Reset the height of the item
Reimplemented by QGraphicsWidget
*/
void QGraphicsItemPrivate::resetHeight()
{
}
/*!
\property QGraphicsObject::children
\since 4.7
\internal
*/
/*!
\property QGraphicsObject::width
\since 4.7
\internal
*/
/*!
\property QGraphicsObject::height
\since 4.7
\internal
*/
/*!
\property QGraphicsObject::parent
\brief the parent of the item
@ -7429,24 +7292,6 @@ void QGraphicsItemPrivate::resetHeight()
\sa scale, rotation, QGraphicsItem::transformOriginPoint()
*/
/*!
\fn void QGraphicsObject::widthChanged()
\internal
*/
/*!
\fn void QGraphicsObject::heightChanged()
\internal
*/
/*!
\fn QGraphicsObject::childrenChanged()
This signal gets emitted whenever the children list changes
\internal
*/
/*!
\property QGraphicsObject::effect
\since 4.7

4
src/gui/graphicsview/qgraphicsitem.h
View file

@ -503,10 +503,6 @@ class Q_GUI_EXPORT QGraphicsObject : public QObject, public QGraphicsItem
Q_PROPERTY(qreal rotation READ rotation WRITE setRotation NOTIFY rotationChanged)
Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged)
Q_PROPERTY(QPointF transformOriginPoint READ transformOriginPoint WRITE setTransformOriginPoint)
Q_PRIVATE_PROPERTY(QGraphicsItem::d_func(), QDeclarativeListProperty<QGraphicsObject> children READ childrenList DESIGNABLE false NOTIFY childrenChanged)
Q_PRIVATE_PROPERTY(QGraphicsItem::d_func(), qreal width READ width WRITE setWidth NOTIFY widthChanged RESET resetWidth FINAL)
Q_PRIVATE_PROPERTY(QGraphicsItem::d_func(), qreal height READ height WRITE setHeight NOTIFY heightChanged RESET resetHeight FINAL)
Q_CLASSINFO("DefaultProperty", "children")
Q_INTERFACES(QGraphicsItem)
public:
QGraphicsObject(QGraphicsItem *parent = 0);

81
src/gui/graphicsview/qgraphicsitem_p.h
View file

@ -45,62 +45,6 @@
QT_BEGIN_NAMESPACE
class QGraphicsItemPrivate;
#ifndef QDECLARATIVELISTPROPERTY
#define QDECLARATIVELISTPROPERTY
template<typename T>
class QDeclarativeListProperty {
public:
typedef void (*AppendFunction)(QDeclarativeListProperty<T> *, T*);
typedef int (*CountFunction)(QDeclarativeListProperty<T> *);
typedef T *(*AtFunction)(QDeclarativeListProperty<T> *, int);
typedef void (*ClearFunction)(QDeclarativeListProperty<T> *);
QDeclarativeListProperty()
: object(0), data(0), append(0), count(0), at(0), clear(0) {}
QDeclarativeListProperty(QObject *o, QList<T *> &list)
: object(o), data(&list), append(qlist_append), count(qlist_count), at(qlist_at),
clear(qlist_clear) {}
QDeclarativeListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = 0, AtFunction t = 0,
ClearFunction r = 0)
: object(o), data(d), append(a), count(c), at(t), clear(r) {}
bool operator==(const QDeclarativeListProperty &o) const {
return object == o.object &&
data == o.data &&
append == o.append &&
count == o.count &&
at == o.at &&
clear == o.clear;
}
QObject *object;
void *data;
AppendFunction append;
CountFunction count;
AtFunction at;
ClearFunction clear;
private:
static void qlist_append(QDeclarativeListProperty *p, T *v) {
((QList<T *> *)p->data)->append(v);
}
static int qlist_count(QDeclarativeListProperty *p) {
return ((QList<T *> *)p->data)->count();
}
static T *qlist_at(QDeclarativeListProperty *p, int idx) {
return ((QList<T *> *)p->data)->at(idx);
}
static void qlist_clear(QDeclarativeListProperty *p) {
return ((QList<T *> *)p->data)->clear();
}
};
#endif
class QGraphicsItemCache
{
public:
@ -190,8 +134,6 @@ public:
ignoreOpacity(false),
filtersDescendantEvents(false),
sceneTransformTranslateOnly(false),
notifyBoundingRectChanged(false),
notifyInvalidated(false),
mouseSetsFocus(true),
explicitActivate(false),
wantsActive(false),
@ -199,8 +141,6 @@ public:
sequentialOrdering(true),
scenePosDescendants(false),
pendingPolish(false),
isDeclarativeItem(false),
sendParentChangeNotification(false),
cacheMode(QGraphicsItem::NoCache),
acceptedMouseButtons(Qt::LeftButton | Qt::RightButton | Qt::MiddleButton),
flags(0),
@ -254,7 +194,6 @@ public:
void resolveDepth();
void addChild(QGraphicsItem *child);
void removeChild(QGraphicsItem *child);
QDeclarativeListProperty<QGraphicsObject> childrenList();
void setParentItemHelper(QGraphicsItem *parent, const QVariant *newParentVariant,
const QVariant *thisPointerVariant);
void childrenBoundingRectHelper(QTransform *x, QRectF *rect, QGraphicsItem *topMostEffectItem);
@ -431,11 +370,6 @@ public:
void resetFocusProxy();
virtual void focusScopeItemChange(bool isSubFocusItem);
static void children_append(QDeclarativeListProperty<QGraphicsObject> *list, QGraphicsObject *item);
static int children_count(QDeclarativeListProperty<QGraphicsObject> *list);
static QGraphicsObject *children_at(QDeclarativeListProperty<QGraphicsObject> *list, int);
static void children_clear(QDeclarativeListProperty<QGraphicsObject> *list);
inline QTransform transformToParent() const;
inline void ensureSortedChildren();
static inline bool insertionOrder(QGraphicsItem *a, QGraphicsItem *b);
@ -443,15 +377,6 @@ public:
inline void sendScenePosChange();
virtual void siblingOrderChange();
// Private Properties
virtual qreal width() const;
virtual void setWidth(qreal);
virtual void resetWidth();
virtual qreal height() const;
virtual void setHeight(qreal);
virtual void resetHeight();
QRectF childrenBoundingRect;
QRectF needsRepaint;
QMap<QWidget *, QRect> paintedViewBoundingRects;
@ -503,8 +428,6 @@ public:
bool ignoreOpacity;
bool filtersDescendantEvents;
bool sceneTransformTranslateOnly;
bool notifyBoundingRectChanged;
bool notifyInvalidated;
bool mouseSetsFocus;
bool explicitActivate;
bool wantsActive;
@ -512,8 +435,6 @@ public:
bool sequentialOrdering;
bool scenePosDescendants;
bool pendingPolish;
bool isDeclarativeItem ;
bool sendParentChangeNotification;
QGraphicsItem::CacheMode cacheMode;
Qt::MouseButtons acceptedMouseButtons;
@ -730,8 +651,6 @@ inline void QGraphicsItemPrivate::markParentDirty(bool updateBoundingRect)
if (updateBoundingRect) {
parentp->dirtyChildrenBoundingRect = true;
// ### Only do this if the parent's effect applies to the entire subtree.
parentp->notifyBoundingRectChanged = true;
}
}
}

4
src/gui/graphicsview/qgraphicsscene.cpp
View file

@ -2437,16 +2437,12 @@ void QGraphicsScene::addItem(QGraphicsItem *item)
return;
}
// QDeclarativeItems do not rely on initial itemChanged message, as the componentComplete
// function allows far more opportunity for delayed-construction optimization.
if (!item->d_ptr->isDeclarativeItem) {
if (d->unpolishedItems.isEmpty()) {
QMetaMethod method = metaObject()->method(d->polishItemsIndex);
method.invoke(this, Qt::QueuedConnection);
}
d->unpolishedItems.append(item);
item->d_ptr->pendingPolish = true;
}
// Detach this item from its parent if the parent's scene is different
// from this scene.

46
src/gui/graphicsview/qgraphicswidget_p.cpp
View file

@ -819,52 +819,6 @@ void QGraphicsWidgetPrivate::setLayout_helper(QGraphicsLayout *l)
}
}
qreal QGraphicsWidgetPrivate::width() const
{
Q_Q(const QGraphicsWidget);
return q->geometry().width();
}
void QGraphicsWidgetPrivate::setWidth(qreal w)
{
if (qIsNaN(w))
return;
Q_Q(QGraphicsWidget);
if (q->geometry().width() == w)
return;
q->setGeometry(QRectF(q->x(), q->y(), w, height()));
}
void QGraphicsWidgetPrivate::resetWidth()
{
Q_Q(QGraphicsWidget);
q->setGeometry(QRectF(q->x(), q->y(), 0, height()));
}
qreal QGraphicsWidgetPrivate::height() const
{
Q_Q(const QGraphicsWidget);
return q->geometry().height();
}
void QGraphicsWidgetPrivate::setHeight(qreal h)
{
if (qIsNaN(h))
return;
Q_Q(QGraphicsWidget);
if (q->geometry().height() == h)
return;
q->setGeometry(QRectF(q->x(), q->y(), width(), h));
}
void QGraphicsWidgetPrivate::resetHeight()
{
Q_Q(QGraphicsWidget);
q->setGeometry(QRectF(q->x(), q->y(), width(), 0));
}
void QGraphicsWidgetPrivate::setGeometryFromSetPos()
{
if (inSetGeometry)

8
src/gui/graphicsview/qgraphicswidget_p.h
View file

@ -115,14 +115,6 @@ public:
void windowFrameHoverLeaveEvent(QGraphicsSceneHoverEvent *event);
bool hasDecoration() const;
// Private Properties
qreal width() const;
void setWidth(qreal);
void resetWidth();
qreal height() const;
void setHeight(qreal);
void resetHeight();
void setGeometryFromSetPos();
// State

2
tests/CMakeLists.txt
View file

@ -8,11 +8,9 @@ include_directories(
${CMAKE_BINARY_DIR}/include/QtCore
${CMAKE_BINARY_DIR}/include/QtGui
${CMAKE_BINARY_DIR}/include/QtDBus
${CMAKE_BINARY_DIR}/include/QtDeclarative
${CMAKE_BINARY_DIR}/include/QtNetwork
${CMAKE_BINARY_DIR}/include/QtSvg
${CMAKE_BINARY_DIR}/include/QtXml
${CMAKE_BINARY_DIR}/include/QtScript
${CMAKE_BINARY_DIR}/include/QtTest
${CMAKE_BINARY_DIR}/include/QtUiTools
)

3
tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp
View file

@ -1348,7 +1348,6 @@ void tst_QPainter::drawTransformedImageRoundedRect()
}
}
//code from QDeclarativeRectangle for drawing rounded rects
void tst_QPainter::drawBorderPixmapRoundedRect()
{
//setup image
@ -1399,7 +1398,6 @@ void tst_QPainter::drawScaledBorderPixmapRoundedRect_data()
// QTest::newRow(QString(QLatin1String("scale=%1; imagetype=RGB16")).arg(i).toLatin1()) << i << (int)QImage::Format_RGB16;
}
//code from QDeclarativeRectangle for drawing rounded rects
void tst_QPainter::drawScaledBorderPixmapRoundedRect()
{
QFETCH(float, scale);
@ -1455,7 +1453,6 @@ void tst_QPainter::drawTransformedBorderPixmapRoundedRect_data()
}
//code from QDeclarativeRectangle for drawing rounded rects
void tst_QPainter::drawTransformedBorderPixmapRoundedRect()
{
QFETCH(QTransform, transform);