diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2007-12-28 05:52:00 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2007-12-28 05:52:00 (GMT) |
commit | 39224b0142078376d2bd39789b4de24a18377cf0 (patch) | |
tree | 874755d12b5f0ae395ebc3eae29697237667cd31 /src/FbTk | |
parent | e8a2f155e8d5a082a8c04f291e65c137c20a05cb (diff) | |
download | fluxbox-39224b0142078376d2bd39789b4de24a18377cf0.zip fluxbox-39224b0142078376d2bd39789b4de24a18377cf0.tar.bz2 |
move Parser to FbTk
Diffstat (limited to 'src/FbTk')
-rw-r--r-- | src/FbTk/Makefile.am | 2 | ||||
-rw-r--r-- | src/FbTk/Parser.cc | 26 | ||||
-rw-r--r-- | src/FbTk/Parser.hh | 52 |
3 files changed, 79 insertions, 1 deletions
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am index b3dd277..86f8594 100644 --- a/src/FbTk/Makefile.am +++ b/src/FbTk/Makefile.am | |||
@@ -40,7 +40,7 @@ libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \ | |||
40 | Layer.hh LayerItem.hh MultLayers.cc MultLayers.hh \ | 40 | Layer.hh LayerItem.hh MultLayers.cc MultLayers.hh \ |
41 | XLayer.cc XLayer.hh XLayerItem.cc XLayerItem.hh \ | 41 | XLayer.cc XLayer.hh XLayerItem.cc XLayerItem.hh \ |
42 | Resource.hh Resource.cc \ | 42 | Resource.hh Resource.cc \ |
43 | StringUtil.hh StringUtil.cc \ | 43 | StringUtil.hh StringUtil.cc Parser.hh Parser.cc \ |
44 | FbString.hh FbString.cc \ | 44 | FbString.hh FbString.cc \ |
45 | Subject.hh Subject.cc Observer.hh Observer.cc \ | 45 | Subject.hh Subject.cc Observer.hh Observer.cc \ |
46 | Transparent.hh Transparent.cc \ | 46 | Transparent.hh Transparent.cc \ |
diff --git a/src/FbTk/Parser.cc b/src/FbTk/Parser.cc new file mode 100644 index 0000000..9e08a53 --- /dev/null +++ b/src/FbTk/Parser.cc | |||
@@ -0,0 +1,26 @@ | |||
1 | // Parser.cc for FbTk | ||
2 | // Copyright (c) 2004 - 2006 Fluxbox Team (fluxgen at fluxbox dot org) | ||
3 | // | ||
4 | // Permission is hereby granted, free of charge, to any person obtaining a | ||
5 | // copy of this software and associated documentation files (the "Software"), | ||
6 | // to deal in the Software without restriction, including without limitation | ||
7 | // the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
8 | // and/or sell copies of the Software, and to permit persons to whom the | ||
9 | // Software is furnished to do so, subject to the following conditions: | ||
10 | // | ||
11 | // The above copyright notice and this permission notice shall be included in | ||
12 | // all copies or substantial portions of the Software. | ||
13 | // | ||
14 | // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
15 | // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
16 | // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
17 | // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
18 | // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
20 | // DEALINGS IN THE SOFTWARE. | ||
21 | |||
22 | #include "Parser.hh" | ||
23 | |||
24 | namespace FbTk { | ||
25 | const Parser::Item Parser::s_empty_item("", ""); | ||
26 | }; | ||
diff --git a/src/FbTk/Parser.hh b/src/FbTk/Parser.hh new file mode 100644 index 0000000..8415d4a --- /dev/null +++ b/src/FbTk/Parser.hh | |||
@@ -0,0 +1,52 @@ | |||
1 | // Parser.hh for FbTk | ||
2 | // Copyright (c) 2004 Henrik Kinnunen (fluxgen at fluxbox dot org) | ||
3 | // and Simon Bowden (rathnor at users.sourceforge.net) | ||
4 | // | ||
5 | // Permission is hereby granted, free of charge, to any person obtaining a | ||
6 | // copy of this software and associated documentation files (the "Software"), | ||
7 | // to deal in the Software without restriction, including without limitation | ||
8 | // the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
9 | // and/or sell copies of the Software, and to permit persons to whom the | ||
10 | // Software is furnished to do so, subject to the following conditions: | ||
11 | // | ||
12 | // The above copyright notice and this permission notice shall be included in | ||
13 | // all copies or substantial portions of the Software. | ||
14 | // | ||
15 | // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
16 | // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
17 | // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
18 | // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
19 | // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
21 | // DEALINGS IN THE SOFTWARE. | ||
22 | |||
23 | #ifndef FBTK_PARSER_HH | ||
24 | #define FBTK_PARSER_HH | ||
25 | |||
26 | #include <string> | ||
27 | #include <utility> | ||
28 | |||
29 | namespace FbTk { | ||
30 | |||
31 | // interface class for a generic Parser | ||
32 | class Parser { | ||
33 | public: | ||
34 | typedef std::pair<std::string, std::string> Item; | ||
35 | static const Item s_empty_item; | ||
36 | |||
37 | virtual ~Parser() { } | ||
38 | |||
39 | virtual bool open(const std::string &filename) = 0; | ||
40 | virtual void close() = 0; | ||
41 | virtual bool eof() const = 0; | ||
42 | virtual bool isLoaded() const = 0; | ||
43 | virtual int row() const = 0; | ||
44 | virtual std::string line() const = 0; | ||
45 | virtual Parser &operator >> (Item &out) = 0; | ||
46 | virtual Item nextItem() = 0; | ||
47 | |||
48 | }; | ||
49 | |||
50 | }; // end namespace FbTk | ||
51 | |||
52 | #endif // FBTK_PARSER_HH | ||