Const-ify Define class

svn path=/trunk/; revision=29680

diff --git a/reactos/tools/rbuild/define.cpp b/reactos/tools/rbuild/define.cpp
index 9e666bd..03ec411 100644 (file)
--- a/reactos/tools/rbuild/define.cpp
+++ b/reactos/tools/rbuild/define.cpp
@@ -33,7 +33,7 @@ Define::Define ( const Project& project,
 }
 
 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,
 }
 
 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 @@ void
 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

diff --git a/reactos/tools/rbuild/project.dtd b/reactos/tools/rbuild/project.dtd
index 9905a60..fb757c6 100644 (file)
--- a/reactos/tools/rbuild/project.dtd
+++ b/reactos/tools/rbuild/project.dtd
@@ -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*)+>

diff --git a/reactos/tools/rbuild/rbuild.h b/reactos/tools/rbuild/rbuild.h
index 0026e39..f00745e 100644 (file)
--- a/reactos/tools/rbuild/rbuild.h
+++ b/reactos/tools/rbuild/rbuild.h
@@ -434,8 +434,8 @@ public:
                 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: