Merge branch 'NateEag-master-patch-12920' into 'master'

[xonotic/netradiant.git] / libs / xml / xmltextags.cpp

diff --git a/libs/xml/xmltextags.cpp b/libs/xml/xmltextags.cpp
index c9d2b06b6087c455c88426c8ab089baf67b971f1..3d6665f21e7846bb5d944ecea4f17155d403c2b2 100644 (file)
--- a/libs/xml/xmltextags.cpp
+++ b/libs/xml/xmltextags.cpp
@@ -23,7 +23,6 @@
 
 #include <string>
 
-#include "qerplugin.h"
 #include "stream/stringstream.h"
 
 XmlTagBuilder::XmlTagBuilder(){
@@ -476,7 +475,7 @@ void XmlTagBuilder::GetShaderTags( const char* shader, std::vector<CopiedString>
           returns a vector containing the tags
         */
 
-       char* expression;
+       char const *expression;
 
        if ( shader == NULL ) { // get all tags from all shaders
                expression = "/root/*/*/tag";
@@ -510,7 +509,7 @@ void XmlTagBuilder::GetUntagged( std::set<CopiedString>& shaders ){
           returns a set containing the shaders (with path)
         */
 
-       char* expression = "/root/*/*[not(child::tag)]";
+       char const *expression = "/root/*/*[not(child::tag)]";
 
        xmlXPathObjectPtr xpathPtr = XpathEval( expression );
        xmlNodeSetPtr nodePtr;
@@ -540,7 +539,7 @@ void XmlTagBuilder::GetAllTags( std::set<CopiedString>& tags ){
           returns a set containing all used tags
         */
 
-       char* expression = "/root/*/*/tag";
+       char const *expression = "/root/*/*/tag";
 
        xmlXPathObjectPtr xpathPtr = XpathEval( expression );
        xmlNodeSetPtr nodePtr;