Parser refactoring.

* Use new style
* Update to C++11
* Use more std::string than char*

1 files changed, 10 insertions, 12 deletions

diff --git a/src/midimapparser.h b/src/midimapparser.h
index 32cd9e8..67a0b4a 100644
--- a/src/midimapparser.h
+++ b/src/midimapparser.h
@@ -24,29 +24,27 @@
  *  along with DrumGizmo; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
-#ifndef __DRUMGIZMO_MIDIMAPPARSER_H__
-#define __DRUMGIZMO_MIDIMAPPARSER_H__
+#pragma once
 
 #include <stdio.h>
 
 #include "saxparser.h"
-
 #include "midimapper.h"
 
-class MidiMapParser : public SAXParser {
+class MidiMapParser
+	: public SAXParser
+{
 public:
-  MidiMapParser(std::string file);
-  ~MidiMapParser();
+	MidiMapParser(const std::string& file);
+	~MidiMapParser();
 
-  void startTag(std::string name, attr_t attr);
+	void startTag(const std::string& name, attr_t& attr) override;
 
-  midimap_t midimap;
+	midimap_t midimap;
 
 protected:
-  int readData(char *data, size_t size);
+	int readData(std::string& data, size_t size) override;
 
 private:
-  FILE *fd;
+	FILE* fd;
 };
-
-#endif/*__DRUMGIZMO_MIDIMAPPARSER_H__*/