tagging ychat-0.7.5ychat-0.7.5

1 files changed, 8 insertions, 34 deletions

diff --git a/src/conf/conf.h b/src/conf/conf.h
index 2353422..3a7d0c6 100644..100755
--- a/src/conf/conf.h
+++ b/src/conf/conf.h
@@ -1,53 +1,27 @@
-/*:*
- *: File: ./src/conf/conf.h
- *: 
- *: yChat; Homepage: www.yChat.org; Version 0.7.9.5-RELEASE
- *: 
- *: Copyright (C) 2003 Paul C. Buetow, Volker Richter
- *: Copyright (C) 2004 Paul C. Buetow
- *: Copyright (C) 2005 EXA Digital Solutions GbR
- *: 
- *: This program is free software; you can redistribute it and/or
- *: modify it under the terms of the GNU General Public License
- *: as published by the Free Software Foundation; either version 2
- *: of the License, or (at your option) any later version.
- *: 
- *: This program is distributed in the hope that it will be useful,
- *: but WITHOUT ANY WARRANTY; without even the implied warranty of
- *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *: GNU General Public License for more details.
- *: 
- *: You should have received a copy of the GNU General Public License
- *: along with this program; if not, write to the Free Software
- *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *:*/
-
 #ifndef CONF_H
 #define CONF_H
 
 class conf; // Predefine for nmap.tmpl
 
-#include <map>
 #include "../incl.h"
-#include "../maps/shashmap.h"
+#include "../maps/nmap.h"
 #include "../name.h"
 #include "../contrib/xml/tinyxml.h"
 
 using namespace std;
 
-class conf : public shashmap<string>, name
+class conf : public nmap<string,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);  //<<
-  int get_int(string s_key);  
+    string colored_error_msg( string s_key );  //<<
 };
 
 #endif