Implemented the first version of the XML request. Fixed eXpat incompatability with XML_Get/SetUserData and the void* in the handler functions.

1 files changed, 5 insertions, 5 deletions

diff --git a/server/src/configuration.cc b/server/src/configuration.cc
index e6d24a9..3b59c93 100644
--- a/server/src/configuration.cc
+++ b/server/src/configuration.cc
@@ -30,14 +30,14 @@
 
 #include "tostring.h"
 
-Pentominos::Configuration::Configuration(std::string filename)
+Configuration::Configuration(std::string filename)
 {
   this->filename = filename;
 
   reload();
 }
 
-void Pentominos::Configuration::reload()
+void Configuration::reload()
   throw(ConfigurationException)
 {
   try {
@@ -51,9 +51,9 @@ void Pentominos::Configuration::reload()
 }
 
 
-static Pentominos::Configuration *_config = NULL;
+static Configuration *_config = NULL;
 
-Pentominos::Configuration *Pentominos::config()
+Configuration *config()
   throw(ConfigurationException)
 {
   if(_config == NULL)
@@ -61,7 +61,7 @@ Pentominos::Configuration *Pentominos::config()
   return _config;
 }
 
-void Pentominos::initConfig(Pentominos::Configuration *config)
+void initConfig(Configuration *config)
 {
   _config = config;
 }