diff options
| author | Andrew Higginson <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
|---|---|---|
| committer | Andrew <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
| commit | 80960b623a99aae1402ab651b2974ef544ed3b03 (patch) | |
| tree | ba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/dom/cssreader.h | |
| parent | try to fix bug (diff) | |
| parent | GDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff) | |
| download | inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip | |
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/dom/cssreader.h')
| -rw-r--r-- | src/dom/cssreader.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/dom/cssreader.h b/src/dom/cssreader.h index 149db31ef..8f795fc9c 100644 --- a/src/dom/cssreader.h +++ b/src/dom/cssreader.h @@ -1,6 +1,7 @@ -#ifndef __CSSREADER_H__ -#define __CSSREADER_H__ +#ifndef SEEN_CSSREADER_H +#define SEEN_CSSREADER_H /** + * @file * Phoebe DOM Implementation. * * This is a C++ approximation of the W3C DOM model, which follows @@ -8,7 +9,8 @@ * which are provided for reference. Most important is this one: * * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html - * + */ +/* * Authors: * Bob Jamison * @@ -51,7 +53,11 @@ public: /** * */ - CssReader() + CssReader() : + stylesheet(), + parsebuf(), + parselen(0), + lastPosition(0) {} /** @@ -73,9 +79,10 @@ public: private: + CSSStyleSheet stylesheet; DOMString parsebuf; long parselen; - CSSStyleSheet stylesheet; + int lastPosition; /** @@ -260,9 +267,6 @@ int getFunction(int p0); */ int getHexColor(int p0); - -int lastPosition; - /** * Get the column and row number of the given character position. * Also gets the last-occuring newline before the position @@ -283,7 +287,7 @@ void getColumnAndRow(int p, int &col, int &row, int &lastNL); -#endif /* __CSSREADER_H__ */ +#endif // SEEN_CSSREADER_H //######################################################################### //# E N D O F F I L E //######################################################################### |