Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanups 

* src/Dialog_Partition_Copy.cc,
  src/Dialog_Partition_Resize_Move.cc: cleanups
This commit is contained in:
Bart Hakvoort 2006-03-07 14:55:35 +00:00
parent daecedfe1e
commit 4f84cff781
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,4 +1,9 @@
2006-03-06 Bart Hakvoort <hakvoort@cvs.gnome.org> 2006-03-07 Bart Hakvoort <hakvoort@cvs.gnome.org>
* src/Dialog_Partition_Copy.cc,
src/Dialog_Partition_Resize_Move.cc: cleanups
2006-03-07 Bart Hakvoort <hakvoort@cvs.gnome.org>
* include/GParted_Core.h, * include/GParted_Core.h,
include/TreeView_Detail.h, include/TreeView_Detail.h,

2
src/Dialog_Partition_Copy.cc
View File

@ -39,7 +39,7 @@ void Dialog_Partition_Copy::Set_Data( const Partition & selected_partition, cons
//set some widely used values... //set some widely used values...
START = selected_partition .sector_start ; START = selected_partition .sector_start ;
total_length = selected_partition .sector_end - selected_partition .sector_start ; total_length = selected_partition .get_length() ;
TOTAL_MB = Utils::Round( Utils::sector_to_unit( selected_partition .get_length(), GParted::UNIT_MIB ) ) ; TOTAL_MB = Utils::Round( Utils::sector_to_unit( selected_partition .get_length(), GParted::UNIT_MIB ) ) ;
MB_PER_PIXEL = TOTAL_MB / 500.00 ; MB_PER_PIXEL = TOTAL_MB / 500.00 ;

18
src/Dialog_Partition_Resize_Move.cc
View File

@ -79,9 +79,9 @@ void Dialog_Partition_Resize_Move::Resize_Move_Normal( const std::vector<Partiti
//calculate total size in MiB's of previous, current and next partition //calculate total size in MiB's of previous, current and next partition
//first find index of partition //first find index of partition
unsigned int t;//FIXME: use Partition::== here unsigned int t;
for ( t = 0 ; t < partitions .size() ; t++ ) for ( t = 0 ; t < partitions .size() ; t++ )
if ( partitions[ t ] .sector_start == selected_partition .sector_start ) if ( partitions[ t ] == selected_partition )
break; break;
Sector previous, next ; Sector previous, next ;
@ -89,16 +89,16 @@ void Dialog_Partition_Resize_Move::Resize_Move_Normal( const std::vector<Partiti
//also check the partitions filesystem ( if this is a 'resize-only' then previous should be 0 ) //also check the partitions filesystem ( if this is a 'resize-only' then previous should be 0 )
if ( t >= 1 && partitions[t -1].type == GParted::TYPE_UNALLOCATED && ! this ->fixed_start ) if ( t >= 1 && partitions[t -1].type == GParted::TYPE_UNALLOCATED && ! this ->fixed_start )
{ {
previous = partitions[t -1] .sector_end - partitions[t -1] .sector_start ; previous = partitions[t -1] .get_length() ;
START = partitions[t -1] .sector_start ; START = partitions[t -1] .sector_start ;
} }
else else
START = selected_partition .sector_start ; START = selected_partition .sector_start ;
if ( t +1 < partitions .size() && partitions[t +1] .type == GParted::TYPE_UNALLOCATED ) if ( t +1 < partitions .size() && partitions[t +1] .type == GParted::TYPE_UNALLOCATED )
next = partitions[t +1].sector_end - partitions[t +1].sector_start ; next = partitions[t +1] .get_length() ;
total_length = previous + selected_partition.get_length() + next; total_length = previous + selected_partition .get_length() + next;
TOTAL_MB = Utils::Round( Utils::sector_to_unit( total_length, GParted::UNIT_MIB ) ) ; TOTAL_MB = Utils::Round( Utils::sector_to_unit( total_length, GParted::UNIT_MIB ) ) ;
MB_PER_PIXEL = TOTAL_MB / 500.00 ; MB_PER_PIXEL = TOTAL_MB / 500.00 ;
@ -166,16 +166,16 @@ void Dialog_Partition_Resize_Move::Resize_Move_Extended( const std::vector<Parti
//calculate length and start of previous //calculate length and start of previous
if ( t > 0 && partitions[t -1].type == GParted::TYPE_UNALLOCATED ) if ( t > 0 && partitions[t -1].type == GParted::TYPE_UNALLOCATED )
{ {
previous = partitions[t -1].sector_end - partitions[t -1].sector_start ; previous = partitions[t -1] .get_length() ;
START = partitions[t -1].sector_start ; START = partitions[t -1] .sector_start ;
} }
else else
START = selected_partition .sector_start ; START = selected_partition .sector_start ;
//calculate length of next //calculate length of next
if ( t +1 < partitions .size() && partitions[ t +1 ] .type == GParted::TYPE_UNALLOCATED ) if ( t +1 < partitions .size() && partitions[ t +1 ] .type == GParted::TYPE_UNALLOCATED )
next = partitions[ t +1 ] .sector_end - partitions[ t +1 ] .sector_start ; next = partitions[ t +1 ] .get_length() ;
//now we have enough data to calculate some important values.. //now we have enough data to calculate some important values..
total_length = previous + selected_partition .get_length() + next; total_length = previous + selected_partition .get_length() + next;
TOTAL_MB = Utils::Round( Utils::sector_to_unit( total_length, UNIT_MIB ) ) ; TOTAL_MB = Utils::Round( Utils::sector_to_unit( total_length, UNIT_MIB ) ) ;