diff --git a/include/Operation.h b/include/Operation.h index caee6bbe..02fd8c80 100644 --- a/include/Operation.h +++ b/include/Operation.h @@ -25,7 +25,7 @@ namespace GParted { - //FIXME: stop using GParted:: in front of our own enums.. it's not necessary and clutters the code + enum OperationType { OPERATION_DELETE = 0, OPERATION_CHECK = 1, diff --git a/src/DrawingAreaVisualDisk.cc b/src/DrawingAreaVisualDisk.cc index dbf4aade..0182ebbb 100644 --- a/src/DrawingAreaVisualDisk.cc +++ b/src/DrawingAreaVisualDisk.cc @@ -36,12 +36,12 @@ DrawingAreaVisualDisk::DrawingAreaVisualDisk() selected_vp = nullptr; // Set some standard colors - color_used .set( Utils::get_color( GParted::FS_USED ) ); - color_unused .set( Utils::get_color( GParted::FS_UNUSED ) ); - color_unallocated .set( Utils::get_color( GParted::FS_UNALLOCATED ) ); + color_used.set(Utils::get_color(FS_USED)); + color_unused.set(Utils::get_color(FS_UNUSED)); + color_unallocated.set(Utils::get_color(FS_UNALLOCATED)); color_text .set( "black" ); add_events( Gdk::BUTTON_PRESS_MASK ); - + set_size_request( -1, HEIGHT ) ; }