Author: sytyi
Date: Tue Aug 23 20:31:36 2011
New Revision: 50896
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50896&view=rev
Log:
Made constructor without params private and commented out validation call
(until schema will be finished)
Modified:
trunk/src/gui/widgets/settings.cpp
trunk/src/serialization/schema_validator.hpp
Modified: trunk/src/gui/widgets/settings.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/settings.cpp?rev=50896&r1=50895&r2=50896&view=diff
==============================================================================
--- trunk/src/gui/widgets/settings.cpp (original)
+++ trunk/src/gui/widgets/settings.cpp Tue Aug 23 20:31:36 2011
@@ -488,7 +488,8 @@
game_config::config_cache::instance().get_preproc_map());
scoped_istream stream =
preprocess_file(get_wml_location("gui/default.cfg"), &preproc);
- read(cfg, *stream, &validator);
+// read(cfg, *stream, &validator);
+ read(cfg, *stream);
} catch(config::error&) {
ERR_GUI_P << "Setting: could not read file
'data/gui/default.cfg'.\n";
}
Modified: trunk/src/serialization/schema_validator.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/serialization/schema_validator.hpp?rev=50896&r1=50895&r2=50896&view=diff
==============================================================================
--- trunk/src/serialization/schema_validator.hpp (original)
+++ trunk/src/serialization/schema_validator.hpp Tue Aug 23 20:31:36 2011
@@ -27,7 +27,6 @@
*/
class schema_validator : public abstract_validator{
public:
- schema_validator();
virtual ~schema_validator();
/**
* Initializes validator from file.
@@ -53,6 +52,7 @@
int start_line,
const std::string
&file);
private:
+ schema_validator();
// types section
// Just some magic to ensure zero initialization.
struct counter{
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
