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

Remove unused index parameter from Add_Operation() (#755214) 

Since this commit earlier in the patchset the second optional parameter
of method Win_GParted::Add_Operation() is no longer used.  Remove it.
    Replace open coded merge of resize/move into create operation
    (#755214)

Bug 755214 - Refactor operation merging
This commit is contained in:
Mike Fleetwood 2015-09-27 09:14:04 +01:00 committed by Curtis Gedak
parent 0e8f24b92b
commit a1ab21285b
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Win_GParted.h
View File

@ -66,7 +66,7 @@ private:
//Fill txtview_device_info_buffer with some information about the selected device
void Fill_Label_Device_Info( bool clear = false );
void Add_Operation( Operation * operation, int index = -1 ) ;
void Add_Operation( Operation * operation );
bool merge_two_operations( unsigned int first, unsigned int second );
void merge_operations( MergeType mergetype );
void Refresh_Visual();

8
src/Win_GParted.cc
View File

@ -700,7 +700,7 @@ bool Win_GParted::on_delete_event( GdkEventAny *event )
return ! Quit_Check_Operations();
}
void Win_GParted::Add_Operation( Operation * operation, int index )
void Win_GParted::Add_Operation( Operation * operation )
{
if ( operation )
{
@ -719,11 +719,7 @@ void Win_GParted::Add_Operation( Operation * operation, int index )
)
{
operation ->create_description() ;
if ( index >= 0 && index < static_cast<int>( operations .size() ) )
operations .insert( operations .begin() + index, operation ) ;
else
operations .push_back( operation );
operations.push_back( operation );
}
else
{