Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/svg/qsvgstyle_p.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
     
    173173public:
    174174    virtual ~QSvgStyleProperty();
    175     virtual void apply(QPainter *p, const QRectF &, QSvgNode *node, QSvgExtraStates &states)  =0;
     175    virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states) = 0;
    176176    virtual void revert(QPainter *p, QSvgExtraStates &states) =0;
    177177    virtual Type type() const=0;
     
    182182public:
    183183    virtual QBrush brush(QPainter *p, QSvgExtraStates &states) = 0;
    184     virtual void apply(QPainter *p, const QRectF &, QSvgNode *node, QSvgExtraStates &states);
     184    virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states);
    185185    virtual void revert(QPainter *p, QSvgExtraStates &states);
    186186};
     
    190190public:
    191191    QSvgQualityStyle(int color);
    192     virtual void apply(QPainter *p, const QRectF &, QSvgNode *node, QSvgExtraStates &states);
     192    virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states);
    193193    virtual void revert(QPainter *p, QSvgExtraStates &states);
    194194    virtual Type type() const;
     
    222222public:
    223223    QSvgOpacityStyle(qreal opacity);
    224     virtual void apply(QPainter *p, const QRectF &, QSvgNode *node, QSvgExtraStates &states);
     224    virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states);
    225225    virtual void revert(QPainter *p, QSvgExtraStates &states);
    226226    virtual Type type() const;
     
    234234public:
    235235    QSvgFillStyle();
    236     virtual void apply(QPainter *p, const QRectF &, QSvgNode *node, QSvgExtraStates &states);
     236    virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states);
    237237    virtual void revert(QPainter *p, QSvgExtraStates &states);
    238238    virtual Type type() const;
     
    307307public:
    308308    QSvgViewportFillStyle(const QBrush &brush);
    309     virtual void apply(QPainter *p, const QRectF &, QSvgNode *node, QSvgExtraStates &states);
     309    virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states);
    310310    virtual void revert(QPainter *p, QSvgExtraStates &states);
    311311    virtual Type type() const;
     
    331331    QSvgFontStyle(QSvgFont *font, QSvgTinyDocument *doc);
    332332    QSvgFontStyle();
    333     virtual void apply(QPainter *p, const QRectF &, QSvgNode *node, QSvgExtraStates &states);
     333    virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states);
    334334    virtual void revert(QPainter *p, QSvgExtraStates &states);
    335335    virtual Type type() const;
     
    339339        // Store the _pixel_ size in the font. Since QFont::setPixelSize() only takes an int, call
    340340        // QFont::SetPointSize() instead. Set proper font size just before rendering.
    341         m_qfont.setPointSize(size);
     341        m_qfont.setPointSizeF(size);
    342342        m_sizeSet = 1;
    343343    }
     
    411411public:
    412412    QSvgStrokeStyle();
    413     virtual void apply(QPainter *p, const QRectF &, QSvgNode *node, QSvgExtraStates &states);
     413    virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states);
    414414    virtual void revert(QPainter *p, QSvgExtraStates &states);
    415415    virtual Type type() const;
     
    618618public:
    619619    QSvgTransformStyle(const QTransform &transform);
    620     virtual void apply(QPainter *p, const QRectF &, QSvgNode *node, QSvgExtraStates &states);
     620    virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states);
    621621    virtual void revert(QPainter *p, QSvgExtraStates &states);
    622622    virtual Type type() const;
     
    655655    void setFreeze(bool freeze);
    656656    void setRepeatCount(qreal repeatCount);
    657     virtual void apply(QPainter *p, const QRectF &, QSvgNode *node, QSvgExtraStates &states);
     657    virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states);
    658658    virtual void revert(QPainter *p, QSvgExtraStates &states);
    659659    virtual Type type() const;
     
    689689
    690690protected:
    691     void resolveMatrix(QSvgNode *node);
     691    void resolveMatrix(const QSvgNode *node);
    692692private:
    693693    qreal m_from, m_to, m_by;
     
    713713    void setFreeze(bool freeze);
    714714    void setRepeatCount(qreal repeatCount);
    715     virtual void apply(QPainter *p, const QRectF &, QSvgNode *node, QSvgExtraStates &states);
     715    virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states);
    716716    virtual void revert(QPainter *p, QSvgExtraStates &states);
    717717    virtual Type type() const;
     
    733733public:
    734734    QSvgCompOpStyle(QPainter::CompositionMode mode);
    735     virtual void apply(QPainter *p, const QRectF &, QSvgNode *node, QSvgExtraStates &states);
     735    virtual void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states);
    736736    virtual void revert(QPainter *p, QSvgExtraStates &states);
    737737    virtual Type type() const;
     
    767767    ~QSvgStyle();
    768768
    769     void apply(QPainter *p, const QRectF &rect, QSvgNode *node, QSvgExtraStates &states);
     769    void apply(QPainter *p, const QSvgNode *node, QSvgExtraStates &states);
    770770    void revert(QPainter *p, QSvgExtraStates &states);
    771771    QSvgRefCounter<QSvgQualityStyle>      quality;
Note: See TracChangeset for help on using the changeset viewer.