[gparted] Rename two GParted_Core methods to detect_filesystem*()

[Curtis Gedak <gedakc src gnome org>]

commit d0580d59550a595bd53ed1144a7d7cca3cfb7f84
Author: Mike Fleetwood <mike fleetwood googlemail com>
Date:   Sun Apr 19 09:52:16 2015 +0100

    Rename two GParted_Core methods to detect_filesystem*()
    
    Rename a couple of GParted_Core methods for consistency and to better
    distinguish get_filesystem() from get_filesystems() which do completely
    unrelated things.
    
      get_filesystem()                 -> detect_filesystem()
      recognise_filesystem_signature() -> detect_filesystem_internal()
    
    Also make detect_filesystem() a static member method as it doesn't use
    any member variables.  Requirement cascades to get_partition_path().

 include/GParted_Core.h |    8 ++++----
 src/GParted_Core.cc    |   12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/include/GParted_Core.h b/include/GParted_Core.h
index dd0fcf5..8a59685 100644
--- a/include/GParted_Core.h
+++ b/include/GParted_Core.h
@@ -77,14 +77,14 @@ private:
                                                      std::map< Glib::ustring, std::vector<Glib::ustring> > & 
map ) ;
        static bool have_rootfs_dev( std::map< Glib::ustring, std::vector<Glib::ustring> > & map ) ;
        static void read_mountpoints_from_mount_command( std::map< Glib::ustring, std::vector<Glib::ustring> 
> & map ) ;
-       Glib::ustring get_partition_path( PedPartition * lp_partition ) ;
+       static Glib::ustring get_partition_path( PedPartition * lp_partition );
        void set_device_partitions( Device & device, PedDevice* lp_device, PedDisk* lp_disk ) ;
        void set_device_one_partition( Device & device, PedDevice * lp_device, FILESYSTEM fstype,
                                       std::vector<Glib::ustring> & messages );
        void set_partition_label_and_uuid( Partition & partition );
-       static FILESYSTEM recognise_filesystem_signature( PedDevice * lp_device, PedPartition * lp_partition 
);
-       GParted::FILESYSTEM get_filesystem( PedDevice* lp_device, PedPartition* lp_partition,
-                                           std::vector<Glib::ustring>& messages ) ;
+       static FILESYSTEM detect_filesystem_internal( PedDevice * lp_device, PedPartition * lp_partition );
+       static FILESYSTEM detect_filesystem( PedDevice * lp_device, PedPartition * lp_partition,
+                                            std::vector<Glib::ustring> & messages );
        void read_label( Partition & partition ) ;
        void read_uuid( Partition & partition ) ;
        void insert_unallocated( const Glib::ustring & device_path,
diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index 798c740..407e87a 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -281,7 +281,7 @@ void GParted_Core::set_devices_thread( std::vector<Device> * pdevices )
                                temp_device .cylsize = (MEBIBYTE / temp_device .sector_size) ;
 
                        std::vector<Glib::ustring> messages;
-                       FILESYSTEM fstype = get_filesystem( lp_device, NULL, messages );
+                       FILESYSTEM fstype = detect_filesystem( lp_device, NULL, messages );
                        // FS_Info (blkid) recognised file system signature on whole disk
                        // device.  Need to detect before libparted reported partitioning
                        // to avoid bug in libparted 1.9.0 to 2.3 inclusive which
@@ -1209,7 +1209,7 @@ void GParted_Core::set_device_partitions( Device & device, PedDevice* lp_device,
                {
                        case PED_PARTITION_NORMAL:
                        case PED_PARTITION_LOGICAL:
-                               filesystem = get_filesystem( lp_device, lp_partition, partition_temp 
.messages ) ;
+                               filesystem = detect_filesystem( lp_device, lp_partition, 
partition_temp.messages );
 #ifndef USE_LIBPARTED_DMRAID
                                //Handle dmraid devices differently because the minor number might not
                                //  match the last number of the partition filename as shown by "ls -l 
/dev/mapper"
@@ -1385,7 +1385,7 @@ void GParted_Core::set_partition_label_and_uuid( Partition & partition )
 
 // GParted simple internal file system signature detection.  Use sparingly.  Only when
 // (old versions of) blkid and libparted don't recognise a signature.
-FILESYSTEM GParted_Core::recognise_filesystem_signature( PedDevice * lp_device, PedPartition * lp_partition )
+FILESYSTEM GParted_Core::detect_filesystem_internal( PedDevice * lp_device, PedPartition * lp_partition )
 {
        char magic1[16];  // Big enough for largest signatures[].sig1 or sig2
        char magic2[16];
@@ -1466,8 +1466,8 @@ FILESYSTEM GParted_Core::recognise_filesystem_signature( PedDevice * lp_device,
        return fstype;
 }
 
-GParted::FILESYSTEM GParted_Core::get_filesystem( PedDevice* lp_device, PedPartition* lp_partition,
-                                                  std::vector<Glib::ustring>& messages )
+FILESYSTEM GParted_Core::detect_filesystem( PedDevice * lp_device, PedPartition * lp_partition,
+                                            std::vector<Glib::ustring> & messages )
 {
        FS_Info fs_info ;
        Glib::ustring fsname = "";
@@ -1567,7 +1567,7 @@ GParted::FILESYSTEM GParted_Core::get_filesystem( PedDevice* lp_device, PedParti
        }
 
        // Fallback to GParted simple internal file system detection
-       FILESYSTEM fstype = recognise_filesystem_signature( lp_device, lp_partition );
+       FILESYSTEM fstype = detect_filesystem_internal( lp_device, lp_partition );
        if ( fstype == FS_LUKS )
                messages.push_back( luks_unsupported );
        if ( fstype != FS_UNKNOWN )