Author: hpoussin Date: Fri Oct 19 17:20:27 2007 New Revision: 29680
URL: http://svn.reactos.org/svn/reactos?rev=29680&view=rev Log: Const-ify Define class
Modified: trunk/reactos/tools/rbuild/define.cpp trunk/reactos/tools/rbuild/project.dtd trunk/reactos/tools/rbuild/rbuild.h
Modified: trunk/reactos/tools/rbuild/define.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/define.cpp?rev... ============================================================================== --- trunk/reactos/tools/rbuild/define.cpp (original) +++ trunk/reactos/tools/rbuild/define.cpp Fri Oct 19 17:20:27 2007 @@ -33,7 +33,7 @@ }
Define::Define ( const Project& project, - const Module* module, + const Module* module, const XMLElement& defineNode ) : project(project), module(module), @@ -43,16 +43,16 @@ }
Define::Define ( const Project& project, - const Module* module, - const std::string name_, - const std::string backend_) + const Module* module, + const std::string& name_, + const std::string& backend_) : project(project), module(module), node(NULL) { name = name_; value = ""; - backend = backend_; + backend = backend_; }
Define::~Define () @@ -63,13 +63,12 @@ Define::Initialize() { const XMLAttribute* att = node->GetAttribute ( "name", true ); - const XMLAttribute* empty = node->GetAttribute ( "empty", false ); - const XMLAttribute* bck = node->GetAttribute ( "backend", false ); + const XMLAttribute* bck = node->GetAttribute ( "backend", false ); assert(att); name = att->value; - value = node->value; - if ( bck ) backend = bck->value; - if( empty ) value = " "; + value = node->value; + if ( bck ) + backend = bck->value; }
void
Modified: trunk/reactos/tools/rbuild/project.dtd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.dtd?re... ============================================================================== --- trunk/reactos/tools/rbuild/project.dtd (original) +++ trunk/reactos/tools/rbuild/project.dtd Fri Oct 19 17:20:27 2007 @@ -37,8 +37,6 @@ <!ELEMENT define (#PCDATA)> <!ATTLIST define name %CIdentifier; #REQUIRED - value %Text; #IMPLIED - empty (true) #IMPLIED
<!ELEMENT directory (compilationunit*|directory*|group*|cdfile|file*|if*|ifnot*|module+|pch*|xi:include*)+>
Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=2... ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Fri Oct 19 17:20:27 2007 @@ -434,8 +434,8 @@ const XMLElement& defineNode ); Define ( const Project& project, const Module* module, - const std::string name_, - const std::string backend_ = "" ); + const std::string& name_, + const std::string& backend_ = "" ); ~Define(); void ProcessXML(); private: