← Back to branch summary

~smartboyhw/ubuntu/raring/calligra/2.6.0-0ubuntu1

« back to all changes in this revision

Viewing changes to plugins/textshape/TextShape.h

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-10-23 21:09:16 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20121023210916-m82w6zxnxhaxz7va
Tags: 1:2.5.90-0ubuntu1
https://launchpad.net/bugs/1070436
https://launchpad.net/bugs/1071686
* New upstream alpha release (LP: #1070436)
  - Add libkactivities-dev and libopenimageio-dev to build-depends
  - Add kubuntu_build_calligraactive.diff to build calligraactive by default
  - Add package for calligraauthor and move files that are shared between
    calligrawords and calligraauthor to calligrawords-common
* Document the patches
* Remove numbers from patches so they follow the same naming scheme as
  the rest of our patches.
* calligra-data breaks replaces krita-data (<< 1:2.5.3) (LP: #1071686)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/textshape/TextShape.h
38
38
class KoImageCollection;
39
39
class KoTextDocument;
40
40
class TextShape;
 
41
class KoTextDocumentLayout;
41
42
 
42
43
/**
43
44
 * A text shape.
96
97
        return m_textShapeData;
97
98
    }
98
99
 
 
100
    void updateDocumentData();
 
101
 
99
102
    virtual void update() const;
100
103
    virtual void update(const QRectF &shape) const;
101
104
 
123
126
    QRegion m_paintRegion;
124
127
    KoParagraphStyle * m_paragraphStyle;
125
128
    bool m_clip;
 
129
    KoTextDocumentLayout *m_layout;
126
130
};
127
131
 
128
132
#endif