Changeset 406 for trunk/src/gui/gui_ascii_renderer.cc

Timestamp:

06/20/15 00:05:17 (10 years ago)

Author:

epyon

Message:

• code compiles cleanly on maximum warning level

File:

• trunk/src/gui/gui_ascii_renderer.cc (modified) (6 diffs)

trunk/src/gui/gui_ascii_renderer.cc

@@ -18 +18 @@
         bool   clear;
         bool   border;
-        char   border_chars[8];
+        uchar8 border_chars[8];
         uint32 border_color;
         uint32 text_color;
@@ -42 +42 @@
         }
         else 
-                er = (ascii_render_data*)( e->m_render_data );
+                er = static_cast< ascii_render_data* >( e->m_render_data );
 
         rectangle abs = e->m_absolute;
@@ -68 +68 @@
                                 er->border_color = uint32( border_color );
                         for ( uint32 i = 0; i < 8 && i < path.length(); )
-                                er->border_chars[i] = path[i];
+                                er->border_chars[i] = static_cast< uchar8 >( path[i] );
                 }
         }
@@ -75 +75 @@
 void ascii_renderer::draw( element* e )
 {
-        ascii_render_data* er = (ascii_render_data*)( e->m_render_data );
+        ascii_render_data* er = static_cast< ascii_render_data* >( e->m_render_data );
         rectangle abs = e->m_absolute;
         if ( er->clear ) m_terminal->clear( abs );
@@ -82 +82 @@
                 for ( int x = 0; x < abs.get_width(); ++x )
                 {
-                        m_terminal->print( position( abs.ul.y, abs.ul.x + x ), er->border_color, (unsigned char)er->border_chars[0] );
-                        m_terminal->print( position( abs.lr.y, abs.ul.x + x ), er->border_color, (unsigned char)er->border_chars[1] );
+                        m_terminal->print( position( abs.ul.y, abs.ul.x + x ), er->border_color, er->border_chars[0] );
+                        m_terminal->print( position( abs.lr.y, abs.ul.x + x ), er->border_color, er->border_chars[1] );
                 }
 
                 for ( int y = 0; y < abs.get_height(); ++y )
                 {
-                        m_terminal->print( position( abs.ul.y + y, abs.ul.x ), er->border_color, (unsigned char)er->border_chars[2] );
-                        m_terminal->print( position( abs.ul.y + y, abs.lr.x ), er->border_color, (unsigned char)er->border_chars[3] );
+                        m_terminal->print( position( abs.ul.y + y, abs.ul.x ), er->border_color, er->border_chars[2] );
+                        m_terminal->print( position( abs.ul.y + y, abs.lr.x ), er->border_color, er->border_chars[3] );
                 }
 
-                m_terminal->print( abs.ul,   er->border_color, (unsigned char)er->border_chars[4] );
-                m_terminal->print( abs.ur(), er->border_color, (unsigned char)er->border_chars[5] );
-                m_terminal->print( abs.ll(), er->border_color, (unsigned char)er->border_chars[6] );
-                m_terminal->print( abs.lr,   er->border_color, (unsigned char)er->border_chars[7] );
+                m_terminal->print( abs.ul,   er->border_color, er->border_chars[4] );
+                m_terminal->print( abs.ur(), er->border_color, er->border_chars[5] );
+                m_terminal->print( abs.ll(), er->border_color, er->border_chars[6] );
+                m_terminal->print( abs.lr,   er->border_color, er->border_chars[7] );
         }
         if ( !e->m_text.empty() )
@@ -102 +102 @@
                 for ( char c : e->m_text )
                 {
-                        m_terminal->print( p, er->text_color, (unsigned char)c );
+                        m_terminal->print( p, er->text_color, static_cast< unsigned char >( c ) );
                         ++p.x;
                 }