diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-07-25 19:06:28 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-07-25 19:06:28 +0000 |
| commit | 73e263588ca2ca99ea7cac8bbf274695dcd0bec6 (patch) | |
| tree | 75a0b4cbc426c1c21671ee784c0230b09ffd4fc4 /src/util/units.h | |
| parent | Merged from trunk (r12419). (diff) | |
| parent | Remove unnecessary variable from the GMarkup-based unit parser (diff) | |
| download | inkscape-73e263588ca2ca99ea7cac8bbf274695dcd0bec6.tar.gz inkscape-73e263588ca2ca99ea7cac8bbf274695dcd0bec6.zip | |
Merge from trunk (r12439).
(bzr r11608.1.108)
Diffstat (limited to 'src/util/units.h')
| -rw-r--r-- | src/util/units.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/util/units.h b/src/util/units.h index 40c89a4a0..4b2d782e3 100644 --- a/src/util/units.h +++ b/src/util/units.h @@ -96,19 +96,17 @@ class UnitTable { void setScale(); - bool load(Glib::ustring const &filename); - - /** Loads units from a text file. + /** Load units from an XML file. * - * loadText loads and merges the contents of the given file into the UnitTable, + * Loads and merges the contents of the given file into the UnitTable, * possibly overwriting existing unit definitions. * * @param filename file to be loaded */ - bool loadText(Glib::ustring const &filename); + bool load(std::string const &filename); /** Saves the current UnitTable to the given file. */ - bool save(Glib::ustring const &filename); + bool save(std::string const &filename); protected: UnitTable::UnitMap _unit_map; |