From 2fb1de809f36d9d955a8602ba7b62fc16d5cd1e0 Mon Sep 17 00:00:00 2001
From: Dick Hollenbeck <dick@softplc.com>
Date: Mon, 19 Jul 2010 10:40:54 -0500
Subject: [PATCH] Running cmake with -DCMAKE_BUILD_TYPE="Debug" causes build
 errors at:

/pcbnew/class_netclass.cpp:324
eeschema/class_sch_component.cpp:933
---
 eeschema/class_sch_component.cpp | 10 +++++-----
 pcbnew/class_netclass.cpp        |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eeschema/class_sch_component.cpp b/eeschema/class_sch_component.cpp
index 9d491d8ec2..8b4792ebaa 100644
--- a/eeschema/class_sch_component.cpp
+++ b/eeschema/class_sch_component.cpp
@@ -930,9 +930,9 @@ void SCH_COMPONENT::Show( int nestLevel, std::ostream& os )
 {
     // for now, make it look like XML:
     NestedSpace( nestLevel, os ) << '<' << GetClass().Lower().mb_str()
-                                 << " ref=\"" << ReturnFieldName( 0 )
+                                 << " ref=\"" << CONV_TO_UTF8( ReturnFieldName( 0 ) )
                                  << '"' << " chipName=\""
-                                 << m_ChipName.mb_str() << '"' <<  m_Pos
+                                 << CONV_TO_UTF8( m_ChipName ) << '"' <<  m_Pos
                                  << " layer=\"" << m_Layer
                                  << '"' << "/>\n";
 
@@ -944,13 +944,13 @@ void SCH_COMPONENT::Show( int nestLevel, std::ostream& os )
         if( !value.IsEmpty() )
         {
             NestedSpace( nestLevel + 1, os ) << "<field" << " name=\""
-                                             << ReturnFieldName( i ).mb_str()
+                                             << CONV_TO_UTF8( ReturnFieldName( i ) )
                                              << '"' <<  " value=\""
-                                             << value.mb_str() << "\"/>\n";
+                                             << CONV_TO_UTF8( value ) << "\"/>\n";
         }
     }
 
-    NestedSpace( nestLevel, os ) << "</" << GetClass().Lower().mb_str()
+    NestedSpace( nestLevel, os ) << "</" << CONV_TO_UTF8( GetClass().Lower() )
                                  << ">\n";
 }
 
diff --git a/pcbnew/class_netclass.cpp b/pcbnew/class_netclass.cpp
index 279f9c0c19..1afa99946a 100644
--- a/pcbnew/class_netclass.cpp
+++ b/pcbnew/class_netclass.cpp
@@ -321,7 +321,7 @@ void NETCLASS::Show( int nestLevel, std::ostream& os )
     for( const_iterator i = begin();  i!=end();  ++i )
     {
         // NestedSpace( nestLevel+1, os ) << *i;
-        os << *i;
+        os << CONV_TO_UTF8( *i );
     }
 
     // NestedSpace( nestLevel, os )