Update formatter.h -> format.h

[libs/datafile.git] / source / binaryparser.cpp

diff --git a/source/binaryparser.cpp b/source/binaryparser.cpp
index ed1d71c8b197db64366e5e858b35ff032bc9b8df..e8487223cf24d1290e07ed302774b3fb7ee00d28 100644 (file)
--- a/source/binaryparser.cpp
+++ b/source/binaryparser.cpp
@@ -1,12 +1,5 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2007-2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <sys/param.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "binaryparser.h"
 #include "input.h"
 
@@ -74,20 +67,20 @@ Statement BinaryParser::parse_statement()
        {
                switch(de.args[j])
                {
-               case 'i':
+               case IntType::signature:
                        result.args.push_back(parse_int());
                        break;
-               case 'f':
+               case FloatType::signature:
                        result.args.push_back(parse_float());
                        break;
-               case 's':
+               case StringType::signature:
                        result.args.push_back(parse_string());
                        break;
-               case 'b':
+               case BoolType::signature:
                        result.args.push_back(parse_bool());
                        break;
-               case 'e':
-                       result.args.push_back(Value(ENUM, parse_enum()));
+               case SymbolType::signature:
+                       result.args.push_back(Symbol(parse_enum()));
                        break;
                }
        }