[gparted] Small simplification of Win_GParted code which calls get_custom_text()
- From: Curtis Gedak <gedakc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gparted] Small simplification of Win_GParted code which calls get_custom_text()
- Date: Sat, 23 May 2015 15:15:36 +0000 (UTC)
commit 9ced6b051e132da39b441600fc0ecda5971bf8e4
Author: Mike Fleetwood <mike fleetwood googlemail com>
Date: Sat May 16 09:58:58 2015 +0100
Small simplification of Win_GParted code which calls get_custom_text()
Avoid long lines, long statements and repeated calls to
gparted_core.get_filesystem_object( selected_partition.filesystem ) by
storing the returned pointer in a local variable.
Needs the previous commit so that the the local variable can be a
pointer to a const FileSystem object instead of a pointer to a
(modifiable) FileSystem object.
src/Win_GParted.cc | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
index 15b71a9..35ab90d 100644
--- a/src/Win_GParted.cc
+++ b/src/Win_GParted.cc
@@ -976,14 +976,12 @@ void Win_GParted::set_valid_operations()
allow_info( true ) ;
// Set an appropriate name for the activate/deactivate menu item.
- if ( gparted_core .get_filesystem_object ( selected_partition .filesystem ) )
+ const FileSystem * filesystem_object = gparted_core.get_filesystem_object(
selected_partition.filesystem );
+ if ( filesystem_object )
dynamic_cast<Gtk::Label*>( menu_partition .items()[ MENU_TOGGLE_BUSY ] .get_child() )
- ->set_label( gparted_core .get_filesystem_object ( selected_partition .filesystem )
- ->get_custom_text ( selected_partition .busy
- ? CTEXT_DEACTIVATE_FILESYSTEM
- : CTEXT_ACTIVATE_FILESYSTEM
- )
- ) ;
+ ->set_label( filesystem_object->get_custom_text( selected_partition.busy
+ ? CTEXT_DEACTIVATE_FILESYSTEM
+ : CTEXT_ACTIVATE_FILESYSTEM ) );
else
dynamic_cast<Gtk::Label*>( menu_partition .items()[ MENU_TOGGLE_BUSY ] .get_child() )
->set_label( FileSystem::get_generic_text ( selected_partition .busy
@@ -2598,20 +2596,22 @@ void Win_GParted::activate_name_partition()
void Win_GParted::activate_change_uuid()
{
- if ( gparted_core .get_filesystem_object( selected_partition .filesystem ) ->get_custom_text (
CTEXT_CHANGE_UUID_WARNING ) != "" ) {
+ const FileSystem * filesystem_object = gparted_core.get_filesystem_object(
selected_partition.filesystem );
+ if ( filesystem_object->get_custom_text( CTEXT_CHANGE_UUID_WARNING ) != "" )
+ {
int i ;
- Gtk::MessageDialog dialog( *this
- , gparted_core .get_filesystem_object( selected_partition
.filesystem ) ->get_custom_text ( CTEXT_CHANGE_UUID_WARNING, 0 )
- , false
- , Gtk::MESSAGE_WARNING
- , Gtk::BUTTONS_OK
- , true
- ) ;
+ Gtk::MessageDialog dialog( *this,
+ filesystem_object->get_custom_text( CTEXT_CHANGE_UUID_WARNING, 0 ),
+ false,
+ Gtk::MESSAGE_WARNING,
+ Gtk::BUTTONS_OK,
+ true );
Glib::ustring tmp_msg = "" ;
- for ( i = 1 ; gparted_core .get_filesystem_object( selected_partition .filesystem )
->get_custom_text ( CTEXT_CHANGE_UUID_WARNING, i ) != "" ; i++ ) {
+ for ( i = 1 ; filesystem_object->get_custom_text( CTEXT_CHANGE_UUID_WARNING, i ) != "" ; i++ )
+ {
if ( i > 1 )
tmp_msg += "\n\n" ;
- tmp_msg += gparted_core .get_filesystem_object( selected_partition .filesystem )
->get_custom_text ( CTEXT_CHANGE_UUID_WARNING, i ) ;
+ tmp_msg += filesystem_object->get_custom_text( CTEXT_CHANGE_UUID_WARNING, i );
}
dialog .set_secondary_text( tmp_msg ) ;
dialog .run() ;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]