gparted r957 - in trunk: . include src
- From: gedakc svn gnome org
- To: svn-commits-list gnome org
- Subject: gparted r957 - in trunk: . include src
- Date: Sat, 8 Nov 2008 23:55:17 +0000 (UTC)
Author: gedakc
Date: Sat Nov 8 23:55:17 2008
New Revision: 957
URL: http://svn.gnome.org/viewvc/gparted?rev=957&view=rev
Log:
Renamed set_label and get_label methods to write_label and read_label respectively.
Modified:
trunk/AUTHORS
trunk/ChangeLog
trunk/include/FileSystem.h
trunk/include/GParted_Core.h
trunk/include/Utils.h
trunk/include/ext2.h
trunk/include/ext3.h
trunk/include/fat16.h
trunk/include/fat32.h
trunk/include/hfs.h
trunk/include/hfsplus.h
trunk/include/jfs.h
trunk/include/linux_swap.h
trunk/include/ntfs.h
trunk/include/reiser4.h
trunk/include/reiserfs.h
trunk/include/ufs.h
trunk/include/xfs.h
trunk/src/DialogFeatures.cc
trunk/src/GParted_Core.cc
trunk/src/Win_GParted.cc
trunk/src/ext2.cc
trunk/src/ext3.cc
trunk/src/fat16.cc
trunk/src/fat32.cc
trunk/src/hfs.cc
trunk/src/hfsplus.cc
trunk/src/jfs.cc
trunk/src/linux_swap.cc
trunk/src/ntfs.cc
trunk/src/reiser4.cc
trunk/src/reiserfs.cc
trunk/src/ufs.cc
trunk/src/xfs.cc
Modified: trunk/AUTHORS
==============================================================================
--- trunk/AUTHORS (original)
+++ trunk/AUTHORS Sat Nov 8 23:55:17 2008
@@ -13,11 +13,11 @@
Curtis Gedak <gedakc users sourceforge net>
* Wrote Utils::cleanup_cursor() function
- * Rewrote get_label functionality for hfs
- * Wrote create, get_label, and check_repair functionality for hfs+
- * Wrote get_label functionality for fat16 and fat32 filesystems
+ * Rewrote read_label functionality for hfs
+ * Wrote create, read_label, and check_repair functionality for hfs+
+ * Wrote read_label functionality for fat16 and fat32 filesystems
* Wrote Utils::regexp_label() function
- * Wrote set partition label functionality
+ * Wrote write partition label functionality
* Created Dialog_Partion_Label.h, Dialog_Partition_Label.cc
* Created OperationLabelPartition.h, OperationLabelPartition.cc
* Maintained from official 0.3.5 release onward
Modified: trunk/include/FileSystem.h
==============================================================================
--- trunk/include/FileSystem.h (original)
+++ trunk/include/FileSystem.h Sat Nov 8 23:55:17 2008
@@ -35,8 +35,8 @@
virtual FS get_filesystem_support() = 0 ;
virtual void set_used_sectors( Partition & partition ) = 0 ;
- virtual void get_label( Partition & partition ) = 0 ;
- virtual bool set_label( const Partition & partition, OperationDetail & operationdetail ) = 0 ;
+ virtual void read_label( Partition & partition ) = 0 ;
+ virtual bool write_label( const Partition & partition, OperationDetail & operationdetail ) = 0 ;
virtual bool create( const Partition & new_partition, OperationDetail & operationdetail ) = 0 ;
virtual bool resize( const Partition & partition_new,
OperationDetail & operationdetail,
Modified: trunk/include/GParted_Core.h
==============================================================================
--- trunk/include/GParted_Core.h (original)
+++ trunk/include/GParted_Core.h Sat Nov 8 23:55:17 2008
@@ -62,7 +62,7 @@
std::vector<Glib::ustring> get_alternate_paths( const Glib::ustring & path ) ;
void set_device_partitions( Device & device ) ;
GParted::FILESYSTEM get_filesystem() ;
- void get_label( Partition & partition ) ;
+ void read_label( Partition & partition ) ;
void insert_unallocated( const Glib::ustring & device_path,
std::vector<Partition> & partitions,
Sector start,
Modified: trunk/include/Utils.h
==============================================================================
--- trunk/include/Utils.h (original)
+++ trunk/include/Utils.h Sat Nov 8 23:55:17 2008
@@ -92,8 +92,8 @@
FILESYSTEM filesystem ;
Support read ; //can we get the amount of used sectors?
- Support get_label ;
- Support set_label ;
+ Support read_label ;
+ Support write_label ;
Support create ;
Support grow ;
Support shrink ;
@@ -106,7 +106,7 @@
FS()
{
- read = get_label = set_label = create = grow = shrink = move = check = copy = NONE;
+ read = read_label = write_label = create = grow = shrink = move = check = copy = NONE;
MIN = MAX = 0 ;
}
} ;
Modified: trunk/include/ext2.h
==============================================================================
--- trunk/include/ext2.h (original)
+++ trunk/include/ext2.h Sat Nov 8 23:55:17 2008
@@ -29,8 +29,8 @@
public:
FS get_filesystem_support() ;
void set_used_sectors( Partition & partition ) ;
- void get_label( Partition & partition ) ;
- bool set_label( const Partition & partition, OperationDetail & operationdetail ) ;
+ void read_label( Partition & partition ) ;
+ bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
bool copy( const Glib::ustring & src_part_path,
Modified: trunk/include/ext3.h
==============================================================================
--- trunk/include/ext3.h (original)
+++ trunk/include/ext3.h Sat Nov 8 23:55:17 2008
@@ -29,8 +29,8 @@
public:
FS get_filesystem_support() ;
void set_used_sectors( Partition & partition ) ;
- void get_label( Partition & partition ) ;
- bool set_label( const Partition & partition, OperationDetail & operationdetail ) ;
+ void read_label( Partition & partition ) ;
+ bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
bool copy( const Glib::ustring & src_part_path,
Modified: trunk/include/fat16.h
==============================================================================
--- trunk/include/fat16.h (original)
+++ trunk/include/fat16.h Sat Nov 8 23:55:17 2008
@@ -29,8 +29,8 @@
public:
FS get_filesystem_support() ;
void set_used_sectors( Partition & partition ) ;
- void get_label( Partition & partition ) ;
- bool set_label( const Partition & partition, OperationDetail & operationdetail ) ;
+ void read_label( Partition & partition ) ;
+ bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
bool copy( const Glib::ustring & src_part_path,
Modified: trunk/include/fat32.h
==============================================================================
--- trunk/include/fat32.h (original)
+++ trunk/include/fat32.h Sat Nov 8 23:55:17 2008
@@ -29,8 +29,8 @@
public:
FS get_filesystem_support();
void set_used_sectors( Partition & partition ) ;
- void get_label( Partition & partition ) ;
- bool set_label( const Partition & partition, OperationDetail & operationdetail ) ;
+ void read_label( Partition & partition ) ;
+ bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
bool copy( const Glib::ustring & src_part_path,
Modified: trunk/include/hfs.h
==============================================================================
--- trunk/include/hfs.h (original)
+++ trunk/include/hfs.h Sat Nov 8 23:55:17 2008
@@ -29,8 +29,8 @@
public:
FS get_filesystem_support() ;
void set_used_sectors( Partition & partition ) ;
- void get_label( Partition & partition ) ;
- bool set_label( const Partition & partition, OperationDetail & operationdetail ) ;
+ void read_label( Partition & partition ) ;
+ bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
bool copy( const Glib::ustring & src_part_path,
Modified: trunk/include/hfsplus.h
==============================================================================
--- trunk/include/hfsplus.h (original)
+++ trunk/include/hfsplus.h Sat Nov 8 23:55:17 2008
@@ -29,8 +29,8 @@
public:
FS get_filesystem_support() ;
void set_used_sectors( Partition & partition ) ;
- void get_label( Partition & partition ) ;
- bool set_label( const Partition & partition, OperationDetail & operationdetail ) ;
+ void read_label( Partition & partition ) ;
+ bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
bool copy( const Glib::ustring & src_part_path,
Modified: trunk/include/jfs.h
==============================================================================
--- trunk/include/jfs.h (original)
+++ trunk/include/jfs.h Sat Nov 8 23:55:17 2008
@@ -29,8 +29,8 @@
public:
FS get_filesystem_support() ;
void set_used_sectors( Partition & partition ) ;
- void get_label( Partition & partition ) ;
- bool set_label( const Partition & partition, OperationDetail & operationdetail ) ;
+ void read_label( Partition & partition ) ;
+ bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
bool copy( const Glib::ustring & src_part_path,
Modified: trunk/include/linux_swap.h
==============================================================================
--- trunk/include/linux_swap.h (original)
+++ trunk/include/linux_swap.h Sat Nov 8 23:55:17 2008
@@ -29,8 +29,8 @@
public:
FS get_filesystem_support() ;
void set_used_sectors( Partition & partition ) ;
- void get_label( Partition & partition ) ;
- bool set_label( const Partition & partition, OperationDetail & operationdetail ) ;
+ void read_label( Partition & partition ) ;
+ bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
bool copy( const Glib::ustring & src_part_path,
Modified: trunk/include/ntfs.h
==============================================================================
--- trunk/include/ntfs.h (original)
+++ trunk/include/ntfs.h Sat Nov 8 23:55:17 2008
@@ -29,8 +29,8 @@
public:
FS get_filesystem_support() ;
void set_used_sectors( Partition & partition ) ;
- void get_label( Partition & partition ) ;
- bool set_label( const Partition & partition, OperationDetail & operationdetail ) ;
+ void read_label( Partition & partition ) ;
+ bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
bool copy( const Glib::ustring & src_part_path,
Modified: trunk/include/reiser4.h
==============================================================================
--- trunk/include/reiser4.h (original)
+++ trunk/include/reiser4.h Sat Nov 8 23:55:17 2008
@@ -29,8 +29,8 @@
public:
FS get_filesystem_support() ;
void set_used_sectors( Partition & partition ) ;
- void get_label( Partition & partition ) ;
- bool set_label( const Partition & partition, OperationDetail & operationdetail ) ;
+ void read_label( Partition & partition ) ;
+ bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
bool copy( const Glib::ustring & src_part_path,
Modified: trunk/include/reiserfs.h
==============================================================================
--- trunk/include/reiserfs.h (original)
+++ trunk/include/reiserfs.h Sat Nov 8 23:55:17 2008
@@ -29,8 +29,8 @@
public:
FS get_filesystem_support() ;
void set_used_sectors( Partition & partition ) ;
- void get_label( Partition & partition ) ;
- bool set_label( const Partition & partition, OperationDetail & operationdetail ) ;
+ void read_label( Partition & partition ) ;
+ bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
bool copy( const Glib::ustring & src_part_path,
Modified: trunk/include/ufs.h
==============================================================================
--- trunk/include/ufs.h (original)
+++ trunk/include/ufs.h Sat Nov 8 23:55:17 2008
@@ -29,8 +29,8 @@
public:
FS get_filesystem_support() ;
void set_used_sectors( Partition & partition ) ;
- void get_label( Partition & partition ) ;
- bool set_label( const Partition & partition, OperationDetail & operationdetail ) ;
+ void read_label( Partition & partition ) ;
+ bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
bool copy( const Glib::ustring & src_part_path,
Modified: trunk/include/xfs.h
==============================================================================
--- trunk/include/xfs.h (original)
+++ trunk/include/xfs.h Sat Nov 8 23:55:17 2008
@@ -29,8 +29,8 @@
public:
FS get_filesystem_support() ;
void set_used_sectors( Partition & partition ) ;
- void get_label( Partition & partition ) ;
- bool set_label( const Partition & partition, OperationDetail & operationdetail ) ;
+ void read_label( Partition & partition ) ;
+ bool write_label( const Partition & partition, OperationDetail & operationdetail ) ;
bool create( const Partition & new_partition, OperationDetail & operationdetail ) ;
bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ;
bool copy( const Glib::ustring & src_part_path,
Modified: trunk/src/DialogFeatures.cc
==============================================================================
--- trunk/src/DialogFeatures.cc (original)
+++ trunk/src/DialogFeatures.cc Sat Nov 8 23:55:17 2008
@@ -93,7 +93,7 @@
treerow[ treeview_filesystems_columns .move ] = fs .move ? icon_yes : icon_no ;
treerow[ treeview_filesystems_columns .copy ] = fs .copy ? icon_yes : icon_no ;
treerow[ treeview_filesystems_columns .check ] = fs .check ? icon_yes : icon_no ;
- treerow[ treeview_filesystems_columns .label ] = fs .set_label ? icon_yes : icon_no ;
+ treerow[ treeview_filesystems_columns .label ] = fs .write_label ? icon_yes : icon_no ;
}
DialogFeatures::~DialogFeatures()
Modified: trunk/src/GParted_Core.cc
==============================================================================
--- trunk/src/GParted_Core.cc (original)
+++ trunk/src/GParted_Core.cc Sat Nov 8 23:55:17 2008
@@ -733,7 +733,7 @@
break;
}
- get_label( partition_temp ) ;
+ read_label( partition_temp ) ;
partition_temp .messages .insert( partition_temp .messages .end(),
libparted_messages. begin(),
@@ -822,15 +822,15 @@
return GParted::FS_UNKNOWN ;
}
-void GParted_Core::get_label( Partition & partition )
+void GParted_Core::read_label( Partition & partition )
{
if ( partition .type != TYPE_EXTENDED )
{
- switch( get_fs( partition .filesystem ) .get_label )
+ switch( get_fs( partition .filesystem ) .read_label )
{
case FS::EXTERNAL:
if ( set_proper_filesystem( partition .filesystem ) )
- p_filesystem ->get_label( partition ) ;
+ p_filesystem ->read_label( partition ) ;
break ;
case FS::LIBPARTED:
break ;
@@ -1209,11 +1209,11 @@
bool succes = false ;
if ( partition .type != TYPE_EXTENDED )
{
- switch( get_fs( partition .filesystem ) .set_label )
+ switch( get_fs( partition .filesystem ) .write_label )
{
case FS::EXTERNAL:
succes = set_proper_filesystem( partition .filesystem ) &&
- p_filesystem ->set_label( partition, operationdetail .get_last_child() ) ;
+ p_filesystem ->write_label( partition, operationdetail .get_last_child() ) ;
break ;
case FS::LIBPARTED:
break ;
Modified: trunk/src/Win_GParted.cc
==============================================================================
--- trunk/src/Win_GParted.cc (original)
+++ trunk/src/Win_GParted.cc Sat Nov 8 23:55:17 2008
@@ -856,7 +856,7 @@
allow_copy( true ) ;
//only allow labelling of real partitions that support labelling
- if ( selected_partition .status == GParted::STAT_REAL && fs .set_label )
+ if ( selected_partition .status == GParted::STAT_REAL && fs .write_label )
allow_label_partition( true ) ;
if ( selected_partition .get_mountpoints() .size() )
Modified: trunk/src/ext2.cc
==============================================================================
--- trunk/src/ext2.cc (original)
+++ trunk/src/ext2.cc Sat Nov 8 23:55:17 2008
@@ -29,8 +29,8 @@
fs .read = FS::EXTERNAL ;
if ( ! Glib::find_program_in_path( "e2label" ) .empty() ) {
- fs .get_label = FS::EXTERNAL ;
- fs .set_label = FS::EXTERNAL ;
+ fs .read_label = FS::EXTERNAL ;
+ fs .write_label = FS::EXTERNAL ;
}
if ( ! Glib::find_program_in_path( "mkfs.ext2" ) .empty() )
@@ -83,7 +83,7 @@
}
}
-void ext2::get_label( Partition & partition )
+void ext2::read_label( Partition & partition )
{
if ( ! Utils::execute_command( "e2label " + partition .get_path(), output, error, true ) )
{
@@ -99,7 +99,7 @@
}
}
-bool ext2::set_label( const Partition & partition, OperationDetail & operationdetail )
+bool ext2::write_label( const Partition & partition, OperationDetail & operationdetail )
{
return ! execute_command( "e2label " + partition .get_path() + " \"" + partition .label + "\"", operationdetail ) ;
}
Modified: trunk/src/ext3.cc
==============================================================================
--- trunk/src/ext3.cc (original)
+++ trunk/src/ext3.cc Sat Nov 8 23:55:17 2008
@@ -30,8 +30,8 @@
fs .read = GParted::FS::EXTERNAL ;
if ( ! Glib::find_program_in_path( "e2label" ) .empty() ) {
- fs .get_label = FS::EXTERNAL ;
- fs .set_label = FS::EXTERNAL ;
+ fs .read_label = FS::EXTERNAL ;
+ fs .write_label = FS::EXTERNAL ;
}
if ( ! Glib::find_program_in_path( "mkfs.ext3" ) .empty() )
@@ -84,7 +84,7 @@
}
}
-void ext3::get_label( Partition & partition )
+void ext3::read_label( Partition & partition )
{
if ( ! Utils::execute_command( "e2label " + partition .get_path(), output, error, true ) )
{
@@ -100,7 +100,7 @@
}
}
-bool ext3::set_label( const Partition & partition, OperationDetail & operationdetail )
+bool ext3::write_label( const Partition & partition, OperationDetail & operationdetail )
{
return ! execute_command( "e2label " + partition .get_path() + " \"" + partition .label + "\"", operationdetail ) ;
}
Modified: trunk/src/fat16.cc
==============================================================================
--- trunk/src/fat16.cc (original)
+++ trunk/src/fat16.cc Sat Nov 8 23:55:17 2008
@@ -44,8 +44,8 @@
}
if ( ! Glib::find_program_in_path( "mlabel" ) .empty() ) {
- fs .get_label = FS::EXTERNAL ;
- fs .set_label = FS::EXTERNAL ;
+ fs .read_label = FS::EXTERNAL ;
+ fs .write_label = FS::EXTERNAL ;
}
//resizing of start and endpoint are provided by libparted
@@ -91,7 +91,7 @@
}
}
-void fat16::get_label( Partition & partition )
+void fat16::read_label( Partition & partition )
{
//Create mtools config file
char fname[] = "/tmp/gparted-XXXXXXXX" ;
@@ -120,7 +120,7 @@
err_msg = Utils::delete_mtoolsrc_file( fname );
}
-bool fat16::set_label( const Partition & partition, OperationDetail & operationdetail )
+bool fat16::write_label( const Partition & partition, OperationDetail & operationdetail )
{
//Create mtools config file
char fname[] = "/tmp/gparted-XXXXXXXX" ;
Modified: trunk/src/fat32.cc
==============================================================================
--- trunk/src/fat32.cc (original)
+++ trunk/src/fat32.cc Sat Nov 8 23:55:17 2008
@@ -44,8 +44,8 @@
}
if ( ! Glib::find_program_in_path( "mlabel" ) .empty() ) {
- fs .get_label = FS::EXTERNAL ;
- fs .set_label = FS::EXTERNAL ;
+ fs .read_label = FS::EXTERNAL ;
+ fs .write_label = FS::EXTERNAL ;
}
//resizing of start and endpoint are provided by libparted
@@ -91,7 +91,7 @@
}
}
-void fat32::get_label( Partition & partition )
+void fat32::read_label( Partition & partition )
{
//Create mtools config file
char fname[] = "/tmp/gparted-XXXXXXXX" ;
@@ -120,7 +120,7 @@
err_msg = Utils::delete_mtoolsrc_file( fname );
}
-bool fat32::set_label( const Partition & partition, OperationDetail & operationdetail )
+bool fat32::write_label( const Partition & partition, OperationDetail & operationdetail )
{
//Create mtools config file
char fname[] = "/tmp/gparted-XXXXXXXX" ;
Modified: trunk/src/hfs.cc
==============================================================================
--- trunk/src/hfs.cc (original)
+++ trunk/src/hfs.cc Sat Nov 8 23:55:17 2008
@@ -37,7 +37,7 @@
fs .check = FS::EXTERNAL ;
if ( ! Glib::find_program_in_path( "vol_id" ) .empty() )
- fs .get_label = FS::EXTERNAL ;
+ fs .read_label = FS::EXTERNAL ;
fs .copy = GParted::FS::GPARTED ;
fs .move = GParted::FS::GPARTED ;
@@ -51,7 +51,7 @@
{
}
-void hfs::get_label( Partition & partition )
+void hfs::read_label( Partition & partition )
{
if ( ! Utils::execute_command( "vol_id " + partition .get_path(), output, error, true ) )
{
@@ -70,7 +70,7 @@
}
}
-bool hfs::set_label( const Partition & partition, OperationDetail & operationdetail )
+bool hfs::write_label( const Partition & partition, OperationDetail & operationdetail )
{
return true ;
}
Modified: trunk/src/hfsplus.cc
==============================================================================
--- trunk/src/hfsplus.cc (original)
+++ trunk/src/hfsplus.cc Sat Nov 8 23:55:17 2008
@@ -37,7 +37,7 @@
fs .check = FS::EXTERNAL ;
if ( ! Glib::find_program_in_path( "vol_id" ) .empty() )
- fs .get_label = FS::EXTERNAL ;
+ fs .read_label = FS::EXTERNAL ;
fs .copy = GParted::FS::GPARTED ;
fs .move = GParted::FS::GPARTED ;
@@ -49,7 +49,7 @@
{
}
-void hfsplus::get_label( Partition & partition )
+void hfsplus::read_label( Partition & partition )
{
if ( ! Utils::execute_command( "vol_id " + partition .get_path(), output, error, true ) )
{
@@ -68,7 +68,7 @@
}
}
-bool hfsplus::set_label( const Partition & partition, OperationDetail & operationdetail )
+bool hfsplus::write_label( const Partition & partition, OperationDetail & operationdetail )
{
return true ;
}
Modified: trunk/src/jfs.cc
==============================================================================
--- trunk/src/jfs.cc (original)
+++ trunk/src/jfs.cc Sat Nov 8 23:55:17 2008
@@ -32,8 +32,8 @@
fs .read = GParted::FS::EXTERNAL ;
if ( ! Glib::find_program_in_path( "jfs_tune" ) .empty() ) {
- fs .get_label = FS::EXTERNAL ;
- fs .set_label = FS::EXTERNAL ;
+ fs .read_label = FS::EXTERNAL ;
+ fs .write_label = FS::EXTERNAL ;
}
if ( ! Glib::find_program_in_path( "mkfs.jfs" ) .empty() )
@@ -104,7 +104,7 @@
}
}
-void jfs::get_label( Partition & partition )
+void jfs::read_label( Partition & partition )
{
if ( ! Utils::execute_command( "jfs_tune -l " + partition .get_path(), output, error, true ) )
{
@@ -120,7 +120,7 @@
}
}
-bool jfs::set_label( const Partition & partition, OperationDetail & operationdetail )
+bool jfs::write_label( const Partition & partition, OperationDetail & operationdetail )
{
return ! execute_command( "jfs_tune -L \"" + partition .label + "\" " + partition .get_path(), operationdetail ) ;
}
Modified: trunk/src/linux_swap.cc
==============================================================================
--- trunk/src/linux_swap.cc (original)
+++ trunk/src/linux_swap.cc Sat Nov 8 23:55:17 2008
@@ -34,7 +34,7 @@
}
if ( ! Glib::find_program_in_path( "vol_id" ) .empty() )
- fs .get_label = FS::EXTERNAL ;
+ fs .read_label = FS::EXTERNAL ;
fs .copy = GParted::FS::GPARTED ;
fs .move = GParted::FS::GPARTED ;
@@ -46,7 +46,7 @@
{
}
-void linux_swap::get_label( Partition & partition )
+void linux_swap::read_label( Partition & partition )
{
if ( ! Utils::execute_command( "vol_id " + partition .get_path(), output, error, true ) )
{
@@ -62,7 +62,7 @@
}
}
-bool linux_swap::set_label( const Partition & partition, OperationDetail & operationdetail )
+bool linux_swap::write_label( const Partition & partition, OperationDetail & operationdetail )
{
return true ;
}
Modified: trunk/src/ntfs.cc
==============================================================================
--- trunk/src/ntfs.cc (original)
+++ trunk/src/ntfs.cc Sat Nov 8 23:55:17 2008
@@ -33,8 +33,8 @@
}
if ( ! Glib::find_program_in_path( "ntfslabel" ) .empty() ) {
- fs .get_label = FS::EXTERNAL ;
- fs .set_label = FS::EXTERNAL ;
+ fs .read_label = FS::EXTERNAL ;
+ fs .write_label = FS::EXTERNAL ;
}
if ( ! Glib::find_program_in_path( "mkntfs" ) .empty() )
@@ -82,7 +82,7 @@
}
}
-void ntfs::get_label( Partition & partition )
+void ntfs::read_label( Partition & partition )
{
if ( ! Utils::execute_command( "ntfslabel --force " + partition .get_path(), output, error, true ) )
{
@@ -98,7 +98,7 @@
}
}
-bool ntfs::set_label( const Partition & partition, OperationDetail & operationdetail )
+bool ntfs::write_label( const Partition & partition, OperationDetail & operationdetail )
{
return ! execute_command( "ntfslabel --force " + partition .get_path() + " \"" + partition .label + "\"", operationdetail ) ;
}
Modified: trunk/src/reiser4.cc
==============================================================================
--- trunk/src/reiser4.cc (original)
+++ trunk/src/reiser4.cc Sat Nov 8 23:55:17 2008
@@ -30,7 +30,7 @@
fs .read = GParted::FS::EXTERNAL ;
if ( ! Glib::find_program_in_path( "vol_id" ) .empty() )
- fs .get_label = FS::EXTERNAL ;
+ fs .read_label = FS::EXTERNAL ;
if ( ! Glib::find_program_in_path( "mkfs.reiser4" ) .empty() )
fs .create = GParted::FS::EXTERNAL ;
@@ -80,7 +80,7 @@
}
}
-void reiser4::get_label( Partition & partition )
+void reiser4::read_label( Partition & partition )
{
if ( ! Utils::execute_command( "vol_id " + partition .get_path(), output, error, true ) )
{
@@ -96,7 +96,7 @@
}
}
-bool reiser4::set_label( const Partition & partition, OperationDetail & operationdetail )
+bool reiser4::write_label( const Partition & partition, OperationDetail & operationdetail )
{
return true ;
}
Modified: trunk/src/reiserfs.cc
==============================================================================
--- trunk/src/reiserfs.cc (original)
+++ trunk/src/reiserfs.cc Sat Nov 8 23:55:17 2008
@@ -29,11 +29,11 @@
if ( ! Glib::find_program_in_path( "debugreiserfs" ) .empty() )
{
fs .read = GParted::FS::EXTERNAL ;
- fs .get_label = FS::EXTERNAL ;
+ fs .read_label = FS::EXTERNAL ;
}
if ( ! Glib::find_program_in_path( "reiserfstune" ) .empty() )
- fs .set_label = FS::EXTERNAL ;
+ fs .write_label = FS::EXTERNAL ;
if ( ! Glib::find_program_in_path( "mkreiserfs" ) .empty() )
fs .create = GParted::FS::EXTERNAL ;
@@ -88,7 +88,7 @@
}
}
-void reiserfs::get_label( Partition & partition )
+void reiserfs::read_label( Partition & partition )
{
//FIXME: i think running debugreiserfs takes a long time on filled filesystems, test for this...
if ( ! Utils::execute_command( "debugreiserfs " + partition .get_path(), output, error, true ) )
@@ -105,7 +105,7 @@
}
}
-bool reiserfs::set_label( const Partition & partition, OperationDetail & operationdetail )
+bool reiserfs::write_label( const Partition & partition, OperationDetail & operationdetail )
{
return ! execute_command( "reiserfstune --label \"" + partition .label + "\" " + partition .get_path(), operationdetail ) ;
}
Modified: trunk/src/ufs.cc
==============================================================================
--- trunk/src/ufs.cc (original)
+++ trunk/src/ufs.cc Sat Nov 8 23:55:17 2008
@@ -37,11 +37,11 @@
{
}
-void ufs::get_label( Partition & partition )
+void ufs::read_label( Partition & partition )
{
}
-bool ufs::set_label( const Partition & partition, OperationDetail & operationdetail )
+bool ufs::write_label( const Partition & partition, OperationDetail & operationdetail )
{
return true ;
}
Modified: trunk/src/xfs.cc
==============================================================================
--- trunk/src/xfs.cc (original)
+++ trunk/src/xfs.cc Sat Nov 8 23:55:17 2008
@@ -31,11 +31,11 @@
if ( ! Glib::find_program_in_path( "xfs_db" ) .empty() )
{
fs .read = GParted::FS::EXTERNAL ;
- fs .get_label = FS::EXTERNAL ;
+ fs .read_label = FS::EXTERNAL ;
}
if ( ! Glib::find_program_in_path( "xfs_admin" ) .empty() )
- fs .set_label = FS::EXTERNAL ;
+ fs .write_label = FS::EXTERNAL ;
if ( ! Glib::find_program_in_path( "mkfs.xfs" ) .empty() )
fs .create = GParted::FS::EXTERNAL ;
@@ -107,7 +107,7 @@
}
}
-void xfs::get_label( Partition & partition )
+void xfs::read_label( Partition & partition )
{
if ( ! Utils::execute_command( "xfs_db -r -c 'label' " + partition .get_path(), output, error, true ) )
{
@@ -123,7 +123,7 @@
}
}
-bool xfs::set_label( const Partition & partition, OperationDetail & operationdetail )
+bool xfs::write_label( const Partition & partition, OperationDetail & operationdetail )
{
Glib::ustring cmd = "" ;
if( partition .label .empty() )
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
