← Back to branch summary

~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.1-2ubuntu4

« back to all changes in this revision

Viewing changes to src/dom/xmlreader.h

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook, Ted Gould, Kees Cook
  • Date: 2009-06-24 14:00:43 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090624140043-07stp20mry48hqup
Tags: 0.47~pre0-0ubuntu1
* New upstream release

[ Ted Gould ]
* debian/control: Adding libgsl0 and removing version specifics on boost

[ Kees Cook ]
* debian/watch: updated to run uupdate and mangle pre-release versions.
* Dropped patches that have been taken upstream:
  - 01_mips
  - 02-poppler-0.8.3
  - 03-chinese-inkscape
  - 05_fix_latex_patch
  - 06_gcc-4.4
  - 07_cdr2svg
  - 08_skip-bad-utf-on-pdf-import
  - 09_gtk-clist
  - 10_belarussian
  - 11_libpng
  - 12_desktop
  - 13_slider
  - 100_svg_import_improvements
  - 102_sp_pattern_painter_free
  - 103_bitmap_type_print

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dom/xmlreader.h
13
13
 * Authors:
14
14
 *   Bob Jamison
15
15
 *
16
 
 * Copyright (C) 2005-2007 Bob Jamison
 
16
 * Copyright (C) 2005-2008 Bob Jamison
17
17
 *
18
18
 *  This library is free software; you can redistribute it and/or
19
19
 *  modify it under the terms of the GNU Lesser General Public
74
74
    /**
75
75
     *
76
76
     */
77
 
    org::w3c::dom::DocumentPtr parseFile(char *fileName);
 
77
    org::w3c::dom::DocumentPtr parseFile(const DOMString &fileName);
78
78
 
79
79
 
80
80
private:
81
81
 
82
 
    void error(char *format, ...)
 
82
    void error(const char *format, ...)
83
83
    #ifdef G_GNUC_PRINTF
84
84
    G_GNUC_PRINTF(2, 3)
85
85
    #endif
87
87
 
88
88
    int  get(int ch);
89
89
    int  peek(int ch);
90
 
    bool match(int pos, char *str);
 
90
    bool match(int pos, char const *str);
91
91
 
92
92
    int  skipwhite(int ch);
93
93
    int  getWord(int pos, DOMString &result);
116
116
    int        len;   //length of parsed region
117
117
    DOMString  parsebuf;
118
118
 
119
 
    DOMString  loadFile(char *fileName);
 
119
    DOMString  loadFile(const DOMString &fileName);
120
120
 
121
121
    int        lineNr;
122
122
    int        colNr;