From d3982ec72b255876db00825605d1d5aae0bc313e Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sat, 6 Apr 2013 13:14:43 +0200
Subject: tagging ychat-0.7.7.1

---
 src/conf/conf.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/conf/conf.h')

diff --git a/src/conf/conf.h b/src/conf/conf.h
index 7ff69ac..20aa91c 100755
--- a/src/conf/conf.h
+++ b/src/conf/conf.h
@@ -1,28 +1,28 @@
-// class conf declaration. this class parses the server config file.
-
 #ifndef CONF_H
 #define CONF_H
 
-class conf;
+class conf; // Predefine for nmap.tmpl
 
+#include <map>
 #include "../incl.h"
-#include "../maps/nmap.h"
+#include "../maps/shashmap.h"
 #include "../name.h"
 #include "../contrib/xml/tinyxml.h"
 
 using namespace std;
 
-class conf : public nmap<string,string>, name
+class conf : public shashmap<string>, name
 {
 private:
-    TiXmlDocument* p_xml;
-    void exit_if_xml_error() const;
-    void parse_xml( TiXmlNode* p_node, vector<string>* p_vec);
+  TiXmlDocument* p_xml;
+  void exit_if_xml_error() const;
+  void parse_xml( TiXmlNode* p_node, vector<string>* p_vec);
+
 public:
-    conf ( string s_conf, map<string,string>* p_start_params );
-    ~conf();
+  conf(string s_conf, map<string,string>* p_start_params);
+  ~conf();
 
-    string colored_error_msg( string s_key );  //<<
+  string colored_error_msg( string s_key );  //<<
 };
 
 #endif
-- 
cgit v1.2.3