diff --git a/ChangeLog b/ChangeLog index a7a2ec3e..804290b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,20 @@ +2006-09-09 Bart Hakvoort + + * include/Frame_Resizer_Base.h, + src/Frame_Resizer_Base.cc, + src/Frame_Resizer_Extended.cc, + src/GParted_Core.cc: trivial 'breakfast cleanups' :) + 2006-09-08 Bart Hakvoort - * src/ext2.cc - src/ext3.cc - src/fat16.cc - src/fat32.cc - src/jfs.cc - src/ntfs.cc - src/reiser4.cc - src/reiserfs.cc + * src/ext2.cc, + src/ext3.cc, + src/fat16.cc, + src/fat32.cc, + src/jfs.cc, + src/ntfs.cc, + src/reiser4.cc, + src/reiserfs.cc, src/xfs.cc: be a bit more verbose on errior in set_used_sectors() 2006-09-08 Bart Hakvoort diff --git a/include/Frame_Resizer_Base.h b/include/Frame_Resizer_Base.h index e99505c5..64c7100d 100644 --- a/include/Frame_Resizer_Base.h +++ b/include/Frame_Resizer_Base.h @@ -76,7 +76,7 @@ protected: std::vector arrow_points; - Gdk::Cursor *cursor_resize, *cursor_normal, *cursor_move; + Gdk::Cursor *cursor_resize, *cursor_move; int temp_x, temp_y ; bool fixed_start; //a fixed start disables moving the start and thereby the whole move functionality.. diff --git a/src/Frame_Resizer_Base.cc b/src/Frame_Resizer_Base.cc index b7072403..0244fba7 100644 --- a/src/Frame_Resizer_Base.cc +++ b/src/Frame_Resizer_Base.cc @@ -52,7 +52,6 @@ void Frame_Resizer_Base::init() color_arrow_rectangle .set( "lightgrey" ); this ->get_colormap() ->alloc_color( color_arrow_rectangle ) ; cursor_resize = new Gdk::Cursor( Gdk::SB_H_DOUBLE_ARROW ) ; - cursor_normal = new Gdk::Cursor( Gdk::LEFT_PTR ) ; cursor_move = new Gdk::Cursor( Gdk::FLEUR ) ; GRIP_MOVE = GRIP_LEFT = GRIP_RIGHT = false; @@ -302,7 +301,7 @@ bool Frame_Resizer_Base::drawingarea_on_mouse_motion( GdkEventMotion * ev ) drawingarea .get_parent_window() ->set_cursor( *cursor_move ) ; //normal pointer else - drawingarea .get_parent_window() ->set_cursor( *cursor_normal ) ; + drawingarea .get_parent_window() ->set_cursor() ; } return true; @@ -347,7 +346,7 @@ bool Frame_Resizer_Base::drawingarea_on_button_release_event( GdkEventButton *ev bool Frame_Resizer_Base::drawingarea_on_leave_notify( GdkEventCrossing *ev ) { if ( ev ->mode != GDK_CROSSING_GRAB && ! GRIP_LEFT && ! GRIP_RIGHT && ! GRIP_MOVE ) - drawingarea .get_parent_window() ->set_cursor( *cursor_normal ) ; + drawingarea .get_parent_window() ->set_cursor() ; return true; } @@ -431,8 +430,6 @@ Frame_Resizer_Base::~Frame_Resizer_Base() if ( cursor_resize ) delete cursor_resize ; - if ( cursor_normal ) - delete cursor_normal ; if ( cursor_move ) delete cursor_move ; } diff --git a/src/Frame_Resizer_Extended.cc b/src/Frame_Resizer_Extended.cc index eb2745bd..ddef9264 100644 --- a/src/Frame_Resizer_Extended.cc +++ b/src/Frame_Resizer_Extended.cc @@ -144,7 +144,7 @@ bool Frame_Resizer_Extended::drawingarea_on_mouse_motion( GdkEventMotion * ev ) drawingarea .get_parent_window() ->set_cursor( *cursor_resize ) ; //normal pointer else - drawingarea .get_parent_window() ->set_cursor( *cursor_normal ) ; + drawingarea .get_parent_window() ->set_cursor() ; } return true ; diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc index a44d035a..fae77eef 100644 --- a/src/GParted_Core.cc +++ b/src/GParted_Core.cc @@ -407,7 +407,7 @@ std::vector GParted_Core::get_disklabeltypes() PedDiskType *disk_type ; for ( disk_type = ped_disk_type_get_next( NULL ) ; disk_type ; disk_type = ped_disk_type_get_next( disk_type ) ) - if ( static_cast( disk_type->name ) != "msdos" ) + if ( Glib::ustring( disk_type->name ) != "msdos" ) disklabeltypes .push_back( disk_type->name ) ; return disklabeltypes ; @@ -510,7 +510,7 @@ void GParted_Core::read_mountpoints_from_file( const Glib::ustring & filename, while ( getline( file, line ) ) if ( Glib::str_has_prefix( line, "/" ) && sscanf( line .c_str(), "%255s %255s", node, mountpoint ) == 2 && - static_cast( node ) != "/dev/root" ) + Glib::ustring( node ) != "/dev/root" ) { line = mountpoint ;