1 files changed, 24 insertions, 16 deletions

diff --git a/src/miav_config.h b/src/miav_config.h
index 756d0f4..5d1fa29 100644
--- a/src/miav_config.h
+++ b/src/miav_config.h
@@ -8,29 +8,36 @@
  ****************************************************************************/
 
 /*
- *  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 file is part of MIaV.
  *
- *  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 Library General Public License for more details.
+ *    MIaV 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.
  *
- *  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.
+ *    MIaV 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 MIaV; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
+
 /*
  * $Id$
  */
+
 /*
  * $Log$
+ * Revision 1.6  2005/05/03 08:31:59  deva
+ * Removed the error object, and replaced it with a more generic info object.
+ *
  * Revision 1.5  2005/05/01 09:56:26  deva
  * Added Id and Log tags to all files
- *
  */
+
 #include <config.h>
 #ifndef __MIAV_MIAV_CONFIG_H__
 #define __MIAV_MIAV_CONFIG_H__
@@ -38,7 +45,7 @@
 #include <string>
 using namespace std;
 
-#include "error.h"
+#include "info.h"
 
 typedef struct __cfg {
   string *name;
@@ -51,7 +58,7 @@ typedef struct __cfg {
 
 class MiavConfig {
 public:
-  MiavConfig(char *file, Error* err = NULL);
+  MiavConfig(char *file, Info* ginfo);
   ~MiavConfig();
 
   int readInt(char *node);
@@ -59,11 +66,12 @@ public:
   string *readString(char *node);
   float readFloat(char *node);
 
-  Error* getErrorObj();
+  Info* getInfoObj();
 
 private:
+  Info *info;
+
   string emptyString;
-  Error* error;
   string filename;
   _cfg *addConfig(_cfg *parent, char* conf);
   int parse(char* conf);