[gparted] Rename create_format_menu_add_item() parameter of type FSType (!52)
- From: Curtis Gedak <gedakc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gparted] Rename create_format_menu_add_item() parameter of type FSType (!52)
- Date: Fri, 6 Dec 2019 17:13:24 +0000 (UTC)
commit f53c462c060fdd52f19311cc74a51229f7c5a18a
Author: Mike Fleetwood <mike fleetwood googlemail com>
Date: Thu Jun 13 10:50:10 2019 +0100
Rename create_format_menu_add_item() parameter of type FSType (!52)
Closes !52 - Rename members and variables currently named 'filesystem'
include/Win_GParted.h | 2 +-
src/Win_GParted.cc | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/include/Win_GParted.h b/include/Win_GParted.h
index b370a281..2721ca8d 100644
--- a/include/Win_GParted.h
+++ b/include/Win_GParted.h
@@ -61,7 +61,7 @@ private:
void init_toolbar() ;
void init_partition_menu() ;
Gtk::Menu * create_format_menu() ;
- void create_format_menu_add_item( FSType filesystem, bool activate );
+ void create_format_menu_add_item(FSType fstype, bool activate);
void init_device_info() ;
void init_hpaned_main() ;
void add_custom_css();
diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
index 649b84ba..176b8448 100644
--- a/src/Win_GParted.cc
+++ b/src/Win_GParted.cc
@@ -544,26 +544,28 @@ Gtk::Menu * Win_GParted::create_format_menu()
return menu ;
}
+
//Add one entry to the Partition --> Format to --> (file system list) menu
-void Win_GParted::create_format_menu_add_item( FSType filesystem, bool activate )
+void Win_GParted::create_format_menu_add_item(FSType fstype, bool activate)
{
hbox = manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL));
//the colored square
- hbox ->pack_start( * manage( new Gtk::Image( Utils::get_color_as_pixbuf( filesystem, 16, 16 ) ) ),
- Gtk::PACK_SHRINK ) ;
+ hbox->pack_start(*manage(new Gtk::Image(Utils::get_color_as_pixbuf(fstype, 16, 16))),
+ Gtk::PACK_SHRINK);
//the label...
- hbox ->pack_start( * Utils::mk_label( " " + Utils::get_filesystem_string( filesystem ) ),
- Gtk::PACK_SHRINK ) ;
+ hbox->pack_start(*Utils::mk_label(" " + Utils::get_filesystem_string(fstype)),
+ Gtk::PACK_SHRINK);
Gtk::MenuItem *item = manage(new Gtk::MenuItem(*hbox));
menu->append(*item);
if ( activate )
item->signal_activate().connect(
- sigc::bind<FSType>( sigc::mem_fun( *this, &Win_GParted::activate_format ), filesystem
) );
+ sigc::bind<FSType>(sigc::mem_fun(*this, &Win_GParted::activate_format), fstype));
else
item->set_sensitive(false);
}
+
void Win_GParted::init_device_info()
{
vbox_info.set_orientation(Gtk::ORIENTATION_VERTICAL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]