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

---
 src/conf/conf.cpp | 18 +++++-------------
 src/conf/conf.h   | 10 +++++-----
 2 files changed, 10 insertions(+), 18 deletions(-)

(limited to 'src/conf')

diff --git a/src/conf/conf.cpp b/src/conf/conf.cpp
index e54cbd4..6670f66 100755
--- a/src/conf/conf.cpp
+++ b/src/conf/conf.cpp
@@ -1,3 +1,5 @@
+// class conf implementation.
+
 #ifndef CONF_CPP
 #define CONF_CPP
 
@@ -17,7 +19,7 @@ conf::conf( string s_conf, map<string,string>* p_start_params ) : nmap<string,st
 
     string s_config;
 
-    for ( int i = 0; i < 4; ++i )
+    for ( int i = 0; i<4; i++ )
     {
      cout << "Checking for " << s_check[i];
      ifstream if_check( s_check[i].c_str() );
@@ -77,14 +79,14 @@ conf::parse_xml(TiXmlNode* p_node, vector<string>* p_vec)
   {
    //cout << p_vec->size() << ": (Value:" << p_child->Value() << ") (Type:" << p_child->Type() << ")" << endl;
 
-   if ( strcmp(p_child->Value(),"category") == 0 )
+   if ( strcmp(p_child->Value(),"category") == 0)
    {
     p_vec->push_back(p_child->ToElement()->Attribute("name"));	
     parse_xml(p_child, p_vec);
     p_vec->pop_back();
    }
 
-   else if ( strcmp(p_child->Value(),"option") == 0 )
+   else if ( strcmp(p_child->Value(),"option") == 0)
    {
     string s_option_name = "";
 
@@ -150,14 +152,4 @@ conf::exit_if_xml_error() const
     }
 }
 
-//<<*
-string
-conf::colored_error_msg(string s_key)
-{
-    return "<font color=\"#" 
-	+ nmap<string,string>::get_elem("chat.html.errorcolor") 
-	+ "\">" + nmap<string,string>::get_elem(s_key) + "</font><br>\n"; 	
-}
-//*>>
-
 #endif
diff --git a/src/conf/conf.h b/src/conf/conf.h
index 3a7d0c6..7508872 100755
--- a/src/conf/conf.h
+++ b/src/conf/conf.h
@@ -1,7 +1,9 @@
+// class conf declaration. this class parses the server config file.
+
 #ifndef CONF_H
 #define CONF_H
 
-class conf; // Predefine for nmap.tmpl
+class conf;
 
 #include "../incl.h"
 #include "../maps/nmap.h"
@@ -16,12 +18,10 @@ private:
     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 ( string s_conf );
+    conf ( string s_conf, map<string,string>* p_start_params );
     ~conf();
-
-    string colored_error_msg( string s_key );  //<<
 };
 
 #endif
-- 
cgit v1.2.3