From 8dc527a3837c937630c8bbbab034b8bc84d496fb Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 22 Jul 2009 07:50:23 +0200 Subject: Remove an unused method in QFxItem propertyInfo was not used by anything, let's just get rid of it. --- src/declarative/extra/qfxparticles.cpp | 6 ------ src/declarative/extra/qfxparticles.h | 2 -- src/declarative/fx/qfximage.cpp | 6 ------ src/declarative/fx/qfximage.h | 1 - src/declarative/fx/qfxitem.cpp | 7 ------- src/declarative/fx/qfxitem.h | 2 -- src/declarative/fx/qfxtext.cpp | 6 ------ src/declarative/fx/qfxtext.h | 2 -- src/declarative/fx/qfxtextedit.cpp | 9 --------- src/declarative/fx/qfxtextedit.h | 2 -- src/declarative/fx/qfxwebview.cpp | 5 ----- src/declarative/fx/qfxwebview.h | 2 -- 12 files changed, 50 deletions(-) diff --git a/src/declarative/extra/qfxparticles.cpp b/src/declarative/extra/qfxparticles.cpp index 08d38ba..a7b01dd 100644 --- a/src/declarative/extra/qfxparticles.cpp +++ b/src/declarative/extra/qfxparticles.cpp @@ -1041,12 +1041,6 @@ void QFxParticles::setMotion(QFxParticleMotion *motion) d->motion = motion; } -QString QFxParticles::propertyInfo() const -{ - Q_D(const QFxParticles); - return d->url.toString(); -} - void QFxParticlesPainter::updateSize() { const int parentX = parentItem()->x(); diff --git a/src/declarative/extra/qfxparticles.h b/src/declarative/extra/qfxparticles.h index 9f085cd..2574f7f 100644 --- a/src/declarative/extra/qfxparticles.h +++ b/src/declarative/extra/qfxparticles.h @@ -203,8 +203,6 @@ public: QFxParticleMotion *motion() const; void setMotion(QFxParticleMotion *); - virtual QString propertyInfo() const; - void paintContents(QPainter &p); protected: diff --git a/src/declarative/fx/qfximage.cpp b/src/declarative/fx/qfximage.cpp index 69030d2..7445606 100644 --- a/src/declarative/fx/qfximage.cpp +++ b/src/declarative/fx/qfximage.cpp @@ -388,12 +388,6 @@ void QFxImage::paintContents(QPainter &p) } } -QString QFxImage::propertyInfo() const -{ - Q_D(const QFxImage); - return d->url.toString(); -} - /*! \qmlproperty enum Image::status diff --git a/src/declarative/fx/qfximage.h b/src/declarative/fx/qfximage.h index 7b3445c..9c0dde8 100644 --- a/src/declarative/fx/qfximage.h +++ b/src/declarative/fx/qfximage.h @@ -91,7 +91,6 @@ public: QUrl source() const; virtual void setSource(const QUrl &url); - virtual QString propertyInfo() const; void paintContents(QPainter &painter); Q_SIGNALS: diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 66a2d99..354e4cc 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -1732,13 +1732,6 @@ QList *QFxItem::transform() } -/*! \internal -*/ -QString QFxItem::propertyInfo() const -{ - return QString(); -} - /*! Creates a new child of the given component \a type. The newChildCreated() signal will be emitted when and if the child is diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h index 4d96076..0dcf852 100644 --- a/src/declarative/fx/qfxitem.h +++ b/src/declarative/fx/qfxitem.h @@ -197,8 +197,6 @@ public: QList *transform(); - virtual QString propertyInfo() const; // ### unused, remove me - bool isClassComplete() const; bool isComponentComplete() const; diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qfxtext.cpp index 2bae53f..3d36bf3 100644 --- a/src/declarative/fx/qfxtext.cpp +++ b/src/declarative/fx/qfxtext.cpp @@ -575,12 +575,6 @@ void QFxTextPrivate::updateSize() // ### text layout handling should be profiled and optimized as needed // what about QStackTextEngine engine(tmp, d->font.font()); QTextLayout textLayout(&engine); -QString QFxText::propertyInfo() const -{ - Q_D(const QFxText); - return QChar(QLatin1Char('\"')) + d->text + QChar(QLatin1Char('\"')); -} - void QFxTextPrivate::drawOutline() { QPixmap img = QPixmap(imgCache.size()); diff --git a/src/declarative/fx/qfxtext.h b/src/declarative/fx/qfxtext.h index b7ec333..a02b76b 100644 --- a/src/declarative/fx/qfxtext.h +++ b/src/declarative/fx/qfxtext.h @@ -125,8 +125,6 @@ public: bool smoothTransform() const; void setSmoothTransform(bool); - virtual QString propertyInfo() const; - void paintContents(QPainter &p); virtual void componentComplete(); diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp index f9cde7c..4a8085b 100644 --- a/src/declarative/fx/qfxtextedit.cpp +++ b/src/declarative/fx/qfxtextedit.cpp @@ -679,15 +679,6 @@ void QFxTextEdit::geometryChanged(const QRectF &newGeometry, } /*! - \internal -*/ -QString QFxTextEdit::propertyInfo() const -{ - Q_D(const QFxTextEdit); - return QChar(QLatin1Char('\"')) + d->text + QChar(QLatin1Char('\"')); -} - -/*! Ensures any delayed caching or data loading the class needs to performed is complete. */ diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qfxtextedit.h index 77fac29..132b474 100644 --- a/src/declarative/fx/qfxtextedit.h +++ b/src/declarative/fx/qfxtextedit.h @@ -161,8 +161,6 @@ public: qreal textMargin() const; void setTextMargin(qreal margin); - virtual QString propertyInfo() const; - virtual void componentComplete(); /* FROM EDIT */ diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp index 42b8d2c..6c23198 100644 --- a/src/declarative/fx/qfxwebview.cpp +++ b/src/declarative/fx/qfxwebview.cpp @@ -507,11 +507,6 @@ void QFxWebView::drawContents(QPainter *p, const QRect &r) page()->mainFrame()->render(p,r); } -QString QFxWebView::propertyInfo() const -{ - return page()->mainFrame()->url().toString(); -} - static QMouseEvent *sceneMouseEventToMouseEvent(QGraphicsSceneMouseEvent *e) { QEvent::Type t; diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h index ab20281..7f22439 100644 --- a/src/declarative/fx/qfxwebview.h +++ b/src/declarative/fx/qfxwebview.h @@ -139,8 +139,6 @@ public: QAction *forwardAction() const; QAction *stopAction() const; - virtual QString propertyInfo() const; - QWebPage *page() const; void setPage(QWebPage *page); -- cgit v0.12