[gparted] Rename class to OperationLabelFileSystem (#741424)



commit 04450c577c94ce8ee9998220c6b2ab4e2dfbe77e
Author: Mike Fleetwood <mike fleetwood googlemail com>
Date:   Fri Dec 19 20:41:08 2014 +0000

    Rename class to OperationLabelFileSystem (#741424)
    
    class OperationLabelPartition   -> OperationLabelFileSystem
    file OperationLabelPartition.h  -> OperationLabelFileSystem.h
    file OperationLabelPartition.cc -> OperationLabelFileSystem.cc
    
    Bug 741424 - Add support for GPT partition names

 include/Makefile.am                                |    2 +-
 ...LabelPartition.h => OperationLabelFileSystem.h} |   16 ++++++++--------
 po/POTFILES.in                                     |    2 +-
 src/GParted_Core.cc                                |    2 +-
 src/Makefile.am                                    |    2 +-
 ...belPartition.cc => OperationLabelFileSystem.cc} |   16 ++++++++--------
 src/Win_GParted.cc                                 |    4 ++--
 7 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/include/Makefile.am b/include/Makefile.am
index 4db4462..869e94e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -31,7 +31,7 @@ EXTRA_DIST = \
        OperationDelete.h               \
        OperationDetail.h               \
        OperationFormat.h               \
-       OperationLabelPartition.h       \
+       OperationLabelFileSystem.h      \
        OperationResizeMove.h           \
        Partition.h                     \
        PipeCapture.h                   \
diff --git a/include/OperationLabelPartition.h b/include/OperationLabelFileSystem.h
similarity index 66%
rename from include/OperationLabelPartition.h
rename to include/OperationLabelFileSystem.h
index eb82d6b..996f4a0 100644
--- a/include/OperationLabelPartition.h
+++ b/include/OperationLabelFileSystem.h
@@ -14,22 +14,22 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GPARTED_OPERATIONLABELPARTITION_H
-#define GPARTED_OPERATIONLABELPARTITION_H
+#ifndef GPARTED_OPERATIONLABELFILESYSTEM_H
+#define GPARTED_OPERATIONLABELFILESYSTEM_H
 
 #include "../include/Operation.h"
 
 namespace GParted
 {
 
-class OperationLabelPartition : public Operation
+class OperationLabelFileSystem : public Operation
 {
 public:
-       OperationLabelPartition( const Device & device,
-                       const Partition & partition_orig,
-                       const Partition & partition_new ) ;
+       OperationLabelFileSystem( const Device & device,
+                                 const Partition & partition_orig,
+                                 const Partition & partition_new );
 
-void apply_to_visual( std::vector<Partition> & partitions ) ;
+       void apply_to_visual( std::vector<Partition> & partitions );
 
 private:
        void create_description() ;
@@ -37,4 +37,4 @@ private:
 
 } //GParted
 
-#endif /* GPARTED_OPERATIONLABELPARTITION_H */
+#endif /* GPARTED_OPERATIONLABELFILESYSTEM_H */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index add7329..86d7f88 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -26,7 +26,7 @@ src/OperationCheck.cc
 src/OperationCreate.cc
 src/OperationDelete.cc
 src/OperationFormat.cc
-src/OperationLabelPartition.cc
+src/OperationLabelFileSystem.cc
 src/OperationResizeMove.cc
 src/Partition.cc
 src/TreeView_Detail.cc
diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index 440c7f1..07850b7 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -26,7 +26,7 @@
 #include "../include/OperationFormat.h"
 #include "../include/OperationResizeMove.h"
 #include "../include/OperationChangeUUID.h"
-#include "../include/OperationLabelPartition.h"
+#include "../include/OperationLabelFileSystem.h"
 #include "../include/Proc_Partitions_Info.h"
 
 #include "../include/btrfs.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 3500645..027c5bb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,7 +42,7 @@ gpartedbin_SOURCES = \
        OperationDelete.cc              \
        OperationDetail.cc              \
        OperationFormat.cc              \
-       OperationLabelPartition.cc      \
+       OperationLabelFileSystem.cc     \
        OperationResizeMove.cc          \
        Partition.cc                    \
        PipeCapture.cc                  \
diff --git a/src/OperationLabelPartition.cc b/src/OperationLabelFileSystem.cc
similarity index 81%
rename from src/OperationLabelPartition.cc
rename to src/OperationLabelFileSystem.cc
index 2be7d9a..381602d 100644
--- a/src/OperationLabelPartition.cc
+++ b/src/OperationLabelFileSystem.cc
@@ -13,15 +13,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/OperationLabelPartition.h"
+
+#include "../include/OperationLabelFileSystem.h"
 
 namespace GParted
 {
 
-OperationLabelPartition::OperationLabelPartition( const Device & device,
-               const Partition & partition_orig,
-               const Partition & partition_new )
+OperationLabelFileSystem::OperationLabelFileSystem( const Device & device,
+                                                    const Partition & partition_orig,
+                                                    const Partition & partition_new )
 {
        type = OPERATION_LABEL_FILESYSTEM;
 
@@ -30,12 +30,12 @@ OperationLabelPartition::OperationLabelPartition( const Device & device,
        this ->partition_new = partition_new ;
 }
 
-void OperationLabelPartition::apply_to_visual( std::vector<Partition> & partitions ) 
+void OperationLabelFileSystem::apply_to_visual( std::vector<Partition> & partitions )
 {
        if ( partition_original .inside_extended )
        {
                index_extended = find_index_extended( partitions ) ;
-               
+
                if ( index_extended >= 0 )
                        index = find_index_original( partitions[ index_extended ] .logicals ) ;
 
@@ -51,7 +51,7 @@ void OperationLabelPartition::apply_to_visual( std::vector<Partition> & partitio
        }
 }
 
-void OperationLabelPartition::create_description() 
+void OperationLabelFileSystem::create_description()
 {
        if( partition_new.get_filesystem_label().empty() ) {
                /* TO TRANSLATORS: looks like   Clear file system Label on /dev/hda3 */
diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
index 9502951..912b2c3 100644
--- a/src/Win_GParted.cc
+++ b/src/Win_GParted.cc
@@ -33,7 +33,7 @@
 #include "../include/OperationFormat.h"
 #include "../include/OperationResizeMove.h"
 #include "../include/OperationChangeUUID.h"
-#include "../include/OperationLabelPartition.h"
+#include "../include/OperationLabelFileSystem.h"
 #include "../include/LVM2_PV_Info.h"
 #include "../config.h"
 
@@ -2485,7 +2485,7 @@ void Win_GParted::activate_label_filesystem()
 
                part_temp.set_filesystem_label( dialog.get_new_label() );
 
-               Operation * operation = new OperationLabelPartition( devices[ current_device ],
+               Operation * operation = new OperationLabelFileSystem( devices[current_device],
                                                                        selected_partition, part_temp ) ;
                operation ->icon = render_icon( Gtk::Stock::EXECUTE, Gtk::ICON_SIZE_MENU );
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]