[gparted] Remove GParted_Core::temp (#683149)
- From: Mike Fleetwood <mfleetwo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gparted] Remove GParted_Core::temp (#683149)
- Date: Sun, 11 Nov 2012 11:49:55 +0000 (UTC)
commit a13bed642449278f17f787c31ef1c2af051b8d3a
Author: Matthias Gehre <M Gehre gmx de>
Date: Sat Sep 1 12:57:07 2012 +0200
Remove GParted_Core::temp (#683149)
Bug #683149 - Cleanup(?): Remove lp_device and lp_disk from GParted_Core
include/GParted_Core.h | 1 -
src/GParted_Core.cc | 11 ++++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/include/GParted_Core.h b/include/GParted_Core.h
index 003b850..65a9fcc 100644
--- a/include/GParted_Core.h
+++ b/include/GParted_Core.h
@@ -213,7 +213,6 @@ private:
std::map< FILESYSTEM, FileSystem * > FILESYSTEM_MAP ;
FileSystem * p_filesystem ;
std::vector<PedPartitionFlag> flags;
- Glib::ustring temp ;
Partition partition_temp ;
FS fs ;
std::vector<Glib::ustring> device_paths ;
diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index 78f2888..5c9f42c 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -1164,6 +1164,7 @@ GParted::FILESYSTEM GParted_Core::get_filesystem( PedDevice* lp_device, PedParti
if ( 0 == memcmp( magic1 , "LUKS\xBA\xBE", 6 ) )
{
+ Glib::ustring temp ;
temp = _( "Linux Unified Key Setup encryption is not yet supported." ) ;
temp += "\n" ;
partition_temp .messages .push_back( temp ) ;
@@ -1181,7 +1182,7 @@ GParted::FILESYSTEM GParted_Core::get_filesystem( PedDevice* lp_device, PedParti
//TODO: Temporary code to detect ext4.
// Replace when libparted >= 1.9.0 is chosen as minimum required version.
- temp = fs_info .get_fs_type( get_partition_path( lp_partition ) ) ;
+ Glib::ustring temp = fs_info .get_fs_type( get_partition_path( lp_partition ) ) ;
if ( temp == "ext4" || temp == "ext4dev" )
fs_type = temp ;
}
@@ -1314,7 +1315,7 @@ GParted::FILESYSTEM GParted_Core::get_filesystem( PedDevice* lp_device, PedParti
}
//no file system found....
- temp = _( "Unable to detect file system! Possible reasons are:" ) ;
+ Glib::ustring temp = _( "Unable to detect file system! Possible reasons are:" ) ;
temp += "\n- ";
temp += _( "The file system is damaged" ) ;
temp += "\n- " ;
@@ -1552,7 +1553,7 @@ void GParted_Core::set_used_sectors( std::vector<Partition> & partitions, PedDis
Sector unallocated ;
if ( ! partitions[ t ] .sector_usage_known() )
{
- temp = _("Unable to read the contents of this file system!") ;
+ Glib::ustring temp = _("Unable to read the contents of this file system!") ;
temp += "\n" ;
temp += _("Because of this some operations may be unavailable.") ;
if ( ! Utils::get_filesystem_software( partitions[ t ] .filesystem ) .empty() )
@@ -1571,7 +1572,7 @@ void GParted_Core::set_used_sectors( std::vector<Partition> & partitions, PedDis
else if ( ( unallocated = partitions[ t ] .get_sectors_unallocated() ) > 0 )
{
/* TO TRANSLATORS: looks like 1.28GiB of unallocated space within the partition. */
- temp = String::ucompose( _("%1 of unallocated space within the partition."),
+ Glib::ustring temp = String::ucompose( _("%1 of unallocated space within the partition."),
Utils::format_size( unallocated, partitions[ t ] .sector_size ) ) ;
FS fs = get_fs( partitions[ t ] .filesystem ) ;
if ( fs .check != GParted::FS::NONE
@@ -1591,7 +1592,7 @@ void GParted_Core::set_used_sectors( std::vector<Partition> & partitions, PedDis
if ( filesystem_resize_disallowed( partitions[ t ] ) )
{
- temp = get_filesystem_object( partitions[ t ] .filesystem )
+ Glib::ustring temp = get_filesystem_object( partitions[ t ] .filesystem )
->get_custom_text( CTEXT_RESIZE_DISALLOWED_WARNING ) ;
if ( ! temp .empty() )
partitions[ t ] .messages .push_back( temp ) ;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]