Changeset 406 for trunk/src/gui

Timestamp:

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

Author:

epyon

Message:

• code compiles cleanly on maximum warning level

Location:

trunk/src/gui

Files:

• gui_ascii_renderer.cc (modified) (6 diffs)
• gui_gfx_renderer.cc (modified) (7 diffs)
• gui_style.cc (modified) (1 diff)

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;
                 }

trunk/src/gui/gui_gfx_renderer.cc

@@ -190 +190 @@
 {
         std::string id_name( filename );
-        char buffer[8]; size_t len = nv::sint32_to_buffer( (sint32)size, buffer );
+        char buffer[8]; size_t len = nv::sint32_to_buffer( sint32( size ), buffer );
         id_name.append( std::string( buffer, len ) );
         auto i = m_font_names.find( id_name );
@@ -197 +197 @@
                 return i->second;
         }
-        size_t result = (size_t)m_fonts.size();
-        texture_font* f = new texture_font( &m_atlas, filename.c_str(), (float)size );
+        size_t result = m_fonts.size();
+        texture_font* f = new texture_font( &m_atlas, filename.c_str(), static_cast<float>( size ) );
         f->load_glyphs( "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ " );
         m_fonts.push_back( f );
@@ -228 +228 @@
 void gfx_renderer::redraw( element* e, uint32 )
 {
-        screen_render_data* sr = (screen_render_data*)m_render_data;
+        screen_render_data* sr = reinterpret_cast< screen_render_data* >( m_render_data );
         if ( e->m_render_data == nullptr )
         {
                 e->m_render_data = new element_render_data( &sr->buffer );
         }
-        element_render_data* er = (element_render_data*)( e->m_render_data );
+        element_render_data* er = reinterpret_cast< element_render_data* >( e->m_render_data );
         size_t size_before = er->buffer.data().size();
 
@@ -318 +318 @@
                         if ( m_style.get( e, "text_color", selector, color ) && m_style.get( e, "text_font", selector, path ) && m_style.get( e, "text_size", selector, border ) )
                         {
-                                size_t font_id = load_font( path, (uint16)border );
+                                size_t font_id = load_font( path, size_t( border ) );
                                 texture_font* font = get_font( font_id );
                                 position p = abs.ul + position( 0, border );
@@ -361 +361 @@
 void gfx_renderer::draw( element* e )
 {
-        element_render_data* er = (element_render_data*)( e->m_render_data );
+        element_render_data* er = reinterpret_cast< element_render_data* >( e->m_render_data );
         er->buffer.commit();
 }
@@ -367 +367 @@
 void gfx_renderer::draw()
 {
-        screen_render_data* sr = (screen_render_data*)m_render_data;
+        screen_render_data* sr = reinterpret_cast< screen_render_data* >( m_render_data );
 
         if ( m_reupload )
         {
-                m_context->update( sr->tex, (void*)m_atlas.get_data() );
+                m_context->update( sr->tex, m_atlas.get_data() );
                 m_reupload = false;
         }
@@ -392 +392 @@
         if ( m_render_data )
         {
-                m_context->get_device()->release( ( (screen_render_data*)m_render_data )->tex );
+                m_context->get_device()->release( reinterpret_cast< screen_render_data* >( m_render_data )->tex );
                 delete m_render_data;
         }

trunk/src/gui/gui_style.cc

@@ -34 +34 @@
         if ( !resolve( e->m_id.c_str(), e->m_class.c_str(), cselector, centry, LUA_TTABLE ) ) return false;
         vec = vec4();
-        for (size_t i = 0; i < 4; ++i )
+        for ( int i = 0; i < 4; ++i )
         {
-                lua_rawgeti( m_lua, -1, static_cast<int>( i+1 ) );
+                lua_rawgeti( m_lua, -1, i+1 );
                 if ( lua_isnil( m_lua, -1 ) ) return true;
-                vec[i] = (float)lua_tonumber( m_lua, -1 );
+                vec[i] = static_cast< float >( lua_tonumber( m_lua, -1 ) );
                 lua_pop( m_lua, 1 );
         }