move Parser to FbTk

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 \
         Layer.hh LayerItem.hh MultLayers.cc MultLayers.hh \
         XLayer.cc XLayer.hh XLayerItem.cc XLayerItem.hh \
         Resource.hh Resource.cc \
-        StringUtil.hh StringUtil.cc \
+        StringUtil.hh StringUtil.cc Parser.hh Parser.cc \
         FbString.hh FbString.cc \
         Subject.hh Subject.cc Observer.hh Observer.cc \
         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 @@
+// Parser.cc for FbTk
+// Copyright (c) 2004 - 2006 Fluxbox Team (fluxgen at fluxbox dot org)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+#include "Parser.hh"
+
+namespace FbTk {
+    const Parser::Item Parser::s_empty_item("", "");
+};
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 @@
+// Parser.hh for FbTk
+// Copyright (c) 2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
+//                and Simon Bowden    (rathnor at users.sourceforge.net)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+#ifndef FBTK_PARSER_HH
+#define FBTK_PARSER_HH
+
+#include <string>
+#include <utility>
+
+namespace FbTk {
+
+// interface class for a generic Parser
+class Parser {
+public:
+    typedef std::pair<std::string, std::string> Item;
+    static const Item s_empty_item;
+
+    virtual ~Parser() { }
+
+    virtual bool open(const std::string &filename) = 0;
+    virtual void close() = 0;
+    virtual bool eof() const = 0;
+    virtual bool isLoaded() const = 0;
+    virtual int row() const = 0;
+    virtual std::string line() const = 0;
+    virtual Parser &operator >> (Item &out) = 0;
+    virtual Item nextItem() = 0;
+
+};
+
+}; // end namespace FbTk
+
+#endif // FBTK_PARSER_HH