Replace custom string classes with std::string - gone forever version

[xonotic/netradiant.git] / radiant / build.cpp

diff --git a/radiant/build.cpp b/radiant/build.cpp
index 3ea279dacd7e06a06e7f38f0e84cdee04335df1e..779ab6bc512261726e3c69387815a1a9e2f9dceb 100644 (file)
--- a/radiant/build.cpp
+++ b/radiant/build.cpp
@@ -29,7 +29,7 @@
 
 #include "mainframe.h"
 
-typedef std::map<CopiedString, CopiedString> Variables;
+typedef std::map<std::string, std::string> Variables;
 Variables g_build_variables;
 
 void build_clear_variables(){
@@ -62,7 +62,7 @@ virtual void exportXML( XMLImporter& importer ) = 0;
 
 class VariableString : public Evaluatable
 {
-CopiedString m_string;
+std::string m_string;
 public:
 VariableString() : m_string(){
 }
@@ -293,7 +293,7 @@ void popElement( const char* name ){
 }
 };
 
-typedef std::pair<CopiedString, Build> BuildPair;
+typedef std::pair<std::string, Build> BuildPair;
 #define SEPARATOR_STRING "-"
 static bool is_separator( const BuildPair &p ){
        if ( !string_equal( p.first.c_str(), SEPARATOR_STRING ) ) {
@@ -350,7 +350,7 @@ Build::iterator Build_find( Build& build, std::size_t index ){
        return i;
 }
 
-typedef std::map<CopiedString, Tool> Tools;
+typedef std::map<std::string, Tool> Tools;
 
 class ProjectXMLConstructor : public XMLElementParser
 {
@@ -410,7 +410,7 @@ void popElement( const char* name ){
 
 class RootXMLConstructor : public XMLElementParser
 {
-CopiedString m_elementName;
+std::string m_elementName;
 XMLElementParser& m_parser;
 SkipAllParser m_skip;
 Version m_version;
@@ -950,7 +950,7 @@ GtkWindow* BuildMenuDialog_construct( ModalDialog& modal, ProjectList& projectLi
 
 namespace
 {
-CopiedString g_buildMenu;
+std::string g_buildMenu;
 }
 
 void LoadBuildMenu();