Make include guards unique (#539297)

Include guards need to be unique within GParted code and all included
library header files.
    http://en.wikipedia.org/wiki/Include_guard#Difficulties

Use this model for all include guards:
    #ifndef GPARTED_FILE_NAME_H
    #define GPARTED_FILE_NAME_H
    ...
    #endif /* GPARTED_FILE_NAME_H */

Closes Bug #539297 - Make include guards unique

include/Copy_Blocks.h

@@ -15,8 +15,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef COPY_BLOCKS_H
-#define COPY_BLOCKS_H
+#ifndef GPARTED_COPY_BLOCKS_H
+#define GPARTED_COPY_BLOCKS_H
 
 #include "../include/Operation.h"
 #include <parted/parted.h>
@@ -62,4 +62,4 @@ public:
 
 } // namespace GParted
 
-#endif // COPY_BLOCKS_H
+#endif /* GPARTED_COPY_BLOCKS_H */

include/DMRaid.h

@@ -24,8 +24,8 @@
  * load the data structures upon each initialization of the class.
  */
 
-#ifndef DMRAID_H_
-#define DMRAID_H_
+#ifndef GPARTED_DMRAID_H
+#define GPARTED_DMRAID_H
 
 #include "../include/Utils.h"
 #include "../include/Partition.h"
@@ -78,4 +78,4 @@ private:
 
 }//GParted
 
-#endif /* DMRAID_H_ */
+#endif /* GPARTED_DMRAID_H */

include/Device.h

@@ -15,9 +15,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
-#ifndef DEVICE
-#define DEVICE
+
+#ifndef GPARTED_DEVICE_H
+#define GPARTED_DEVICE_H
 
 #include "../include/Partition.h"
 
@@ -63,5 +63,5 @@ private:
 };
  
 } //GParted
- 
-#endif //DEVICE
+
+#endif /* GPARTED_DEVICE_H */

include/DialogFeatures.h

@@ -15,9 +15,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
-#ifndef DIALOG_FEATURES
-#define DIALOG_FEATURES
+
+#ifndef GPARTED_DIALOGFEATURES_H
+#define GPARTED_DIALOGFEATURES_H
 
 #include "../include/Utils.h"
 
@@ -81,4 +81,4 @@ private:
 
 } //GParted
 
-#endif //DIALOG_FEATURES
+#endif /* GPARTED_DIALOGFEATURES_H */

include/DialogManageFlags.h

@@ -14,10 +14,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
 
-#ifndef DIALOG_MANAGE_FLAGS
-#define DIALOG_MANAGE_FLAGS
+
+#ifndef GPARTED_DIALOGMANAGEFLAGS_H
+#define GPARTED_DIALOGMANAGEFLAGS_H
 
 #include "../include/Partition.h"
 
@@ -67,5 +67,4 @@ private:
 
 } //GParted
 
-
-#endif //DIALOG_MANAGE_FLAGS
+#endif /* GPARTED_DIALOGMANAGEFLAGS_H */

include/Dialog_Base_Partition.h

@@ -15,9 +15,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
-#ifndef DIALOG_BASE_PARTITION
-#define DIALOG_BASE_PARTITION
+
+#ifndef GPARTED_DIALOG_BASE_PARTITION_H
+#define GPARTED_DIALOG_BASE_PARTITION_H
 
 #include "../include/Frame_Resizer_Extended.h"
 #include "../include/Partition.h"
@@ -105,4 +105,4 @@ private:
 
 } //GParted
 
-#endif //DIALOG_BASE_PARTITION
+#endif /* GPARTED_DIALOG_BASE_PARTITION_H */

include/Dialog_Disklabel.h

@@ -14,10 +14,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
 
-#ifndef DIALOG_DISKLABEL
-#define DIALOG_DISKLABEL
+
+#ifndef GPARTED_DIALOG_DISKLABEL_H
+#define GPARTED_DIALOG_DISKLABEL_H
 
 #include "../include/Utils.h"
 
@@ -46,5 +46,4 @@ private:
 
 } //GParted
 
-
-#endif //DIALOG_DISKLABEL
+#endif /* GPARTED_DIALOG_DISKLABEL_H */

include/Dialog_Partition_Copy.h

@@ -15,9 +15,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
-#ifndef DIALOG_PARTITION_COPY
-#define DIALOG_PARTITION_COPY
+
+#ifndef GPARTED_DIALOG_PARTITION_COPY_H
+#define GPARTED_DIALOG_PARTITION_COPY_H
 
 #include "../include/Dialog_Base_Partition.h"
 
@@ -37,4 +37,4 @@ private:
 
 }//GParted
 
-#endif //DIALOG_PARTITION_COPY
+#endif /* GPARTED_DIALOG_PARTITION_COPY_H */

include/Dialog_Partition_Info.h

@@ -15,8 +15,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef DIALOG_PARTITION_INFO
-#define DIALOG_PARTITION_INFO
+#ifndef GPARTED_DIALOG_PARTITION_INFO_H
+#define GPARTED_DIALOG_PARTITION_INFO_H
 
 //what kind of info would one prefer to see here?
 //my guess is, it's best to keep the amount of info minimal and wait for users requests
@@ -65,4 +65,4 @@ private:
 
 } //GParted
 
-#endif //DIALOG_PARTITION_INFO
+#endif /* GPARTED_DIALOG_PARTITION_INFO_H */

include/Dialog_Partition_Label.h

@@ -14,9 +14,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
-#ifndef DIALOG_PARTITION_LABEL_H_
-#define DIALOG_PARTITION_LABEL_H_
+
+#ifndef GPARTED_DIALOG_PARTITION_LABEL_H
+#define GPARTED_DIALOG_PARTITION_LABEL_H
 
 #include "../include/Partition.h"
 #include "../include/i18n.h"
@@ -45,4 +45,4 @@ private:
 
 } //GParted
 
-#endif //DIALOG_PARTITION_LABEL_H_
+#endif /* GPARTED_DIALOG_PARTITION_LABEL_H */

include/Dialog_Partition_New.h

@@ -15,9 +15,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
-#ifndef DIALOG_PARTITION_NEW
-#define DIALOG_PARTITION_NEW
+
+#ifndef GPARTED_DIALOG_PARTITION_NEW_H
+#define GPARTED_DIALOG_PARTITION_NEW_H
 
 #include "../include/Dialog_Base_Partition.h"
 
@@ -56,4 +56,4 @@ private:
 
 } //GParted
 
-#endif //DIALOG_PARTITION_NEW
+#endif /* GPARTED_DIALOG_PARTITION_NEW_H */

include/Dialog_Partition_Resize_Move.h

@@ -15,8 +15,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef DIALOG_PARTITION_RESIZE_MOVE
-#define DIALOG_PARTITION_RESIZE_MOVE
+#ifndef GPARTED_DIALOG_PARTITION_RESIZE_MOVE_H
+#define GPARTED_DIALOG_PARTITION_RESIZE_MOVE_H
 
 #include "../include/Dialog_Base_Partition.h"
 
@@ -36,4 +36,4 @@ private:
 
 } //GParted
 
-#endif //DIALOG_PARTITION_RESIZE_MOVE
+#endif /* GPARTED_DIALOG_PARTITION_RESIZE_MOVE_H */

include/Dialog_Progress.h

@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef DIALOG_PARTITION_PROGRESS
-#define DIALOG_PARTITION_PROGRESS
+#ifndef GPARTED_DIALOG_PROGRESS_H
+#define GPARTED_DIALOG_PROGRESS_H
 
 #include "../include/i18n.h"
 #include "../include/Utils.h"
@@ -103,4 +103,4 @@ private:
 
 }//GParted
 
-#endif //DIALOG_PARTITION_PROGRESS
+#endif /* GPARTED_DIALOG_PROGRESS_H */

include/Dialog_Rescue_Data.h

@@ -20,8 +20,8 @@
  * Reads the output of gpart and build the dialog
  * */
 
-#ifndef DIALOG_RESCUE_DATA
-#define DIALOG_RESCUE_DATA
+#ifndef GPARTED_DIALOG_RESCUE_DATA_H
+#define GPARTED_DIALOG_RESCUE_DATA_H
 
 #include "../include/Device.h"
 #include "../include/Partition.h"
@@ -73,5 +73,4 @@ private:
 
 } //GParted
 
-
-#endif //DIALOG_RESCUE_DATA
+#endif /* GPARTED_DIALOG_RESCUE_DATA_H */

include/DrawingAreaVisualDisk.h

@@ -15,8 +15,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef DRAWINGAREA_VISUALDISK
-#define DRAWINGAREA_VISUALDISK
+#ifndef GPARTED_DRAWINGAREAVISUALDISK_H
+#define GPARTED_DRAWINGAREAVISUALDISK_H
 
 #include "../include/Partition.h"
 
@@ -120,4 +120,5 @@ private:
 };
 
 } //GParted
-#endif //DRAWINGAREA_VISUALDISK
+
+#endif /* GPARTED_DRAWINGAREAVISUALDISK_H */

include/FS_Info.h

@@ -15,8 +15,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef FS_INFO_H_
-#define FS_INFO_H_
+#ifndef GPARTED_FS_INFO_H
+#define GPARTED_FS_INFO_H
 
 #include "../include/Utils.h"
 
@@ -46,4 +46,4 @@ private:
 
 }//GParted
 
-#endif /*FS_INFO_H_*/
+#endif /* GPARTED_FS_INFO_H */

include/FileSystem.h

@@ -15,10 +15,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
- 
-#ifndef DEFINE_FILESYSTEM
-#define DEFINE_FILESYSTEM
+
+
+#ifndef GPARTED_FILESYSTEM_H
+#define GPARTED_FILESYSTEM_H
 
 #include "../include/Operation.h"
 #include "../include/PipeCapture.h"
@@ -81,4 +81,4 @@ private:
 
 } //GParted
 
-#endif //DEFINE_FILESYSTEM
+#endif /* GPARTED_FILESYSTEM_H */

include/Frame_Resizer_Base.h

@@ -15,9 +15,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
-#ifndef FRAME_RESIZER_BASE
-#define FRAME_RESIZER_BASE
+
+#ifndef GPARTED_FRAME_RESIZER_BASE_H
+#define GPARTED_FRAME_RESIZER_BASE_H
 
 #include <gtkmm/frame.h>
 #include <gtkmm/drawingarea.h>
@@ -89,4 +89,4 @@ private:
 
 };
 
-#endif // FRAME_RESIZER_BASE
+#endif /* GPARTED_FRAME_RESIZER_BASE_H */

include/Frame_Resizer_Extended.h

@@ -14,10 +14,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
- 
-#ifndef FRAME_RESIZER_EXTENDED
-#define FRAME_RESIZER_EXTENDED
+
+
+#ifndef GPARTED_FRAME_RESIZER_EXTENDED_H
+#define GPARTED_FRAME_RESIZER_EXTENDED_H
 
 #include "../include/Frame_Resizer_Base.h"
  
@@ -37,4 +37,4 @@ private:
 	virtual void Draw_Partition() ;
 };
 
-#endif //FRAME_RESIZER_EXTENDED
+#endif /* GPARTED_FRAME_RESIZER_EXTENDED_H */

include/GParted_Core.h

@@ -15,9 +15,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
-#ifndef GPARTED_CORE
-#define GPARTED_CORE
+
+#ifndef GPARTED_GPARTED_CORE_H
+#define GPARTED_GPARTED_CORE_H
 
 #include "../include/FileSystem.h"
 #include "../include/Operation.h"
@@ -205,5 +205,4 @@ private:
 
 } //GParted
 
-
-#endif //GPARTED_CORE
+#endif /* GPARTED_GPARTED_CORE_H */

include/HBoxOperations.h

@@ -14,9 +14,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
-#ifndef HBOX_OPERATIONS
-#define HBOX_OPERATIONS
+
+#ifndef GPARTED_HBOXOPERATIONS_H
+#define GPARTED_HBOXOPERATIONS_H
 
 #include "../include/Operation.h"
 
@@ -71,4 +71,4 @@ private:
 
 } //GParted
 
-#endif //HBOX_OPERATIONS
+#endif /* GPARTED_HBOXOPERATIONS_H */

include/LVM2_PV_Info.h

@@ -23,8 +23,8 @@
  * their attributes.
  */
 
-#ifndef LVM2_PV_INFO_H_
-#define LVM2_PV_INFO_H_
+#ifndef GPARTED_LVM2_PV_INFO_H
+#define GPARTED_LVM2_PV_INFO_H
 
 #include "../include/Utils.h"
 
@@ -68,4 +68,4 @@ private:
 
 }//GParted
 
-#endif /*LVM2_PV_INFO_H_*/
+#endif /* GPARTED_LVM2_PV_INFO_H */

include/Operation.h

@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef OPERATION
-#define OPERATION
+#ifndef GPARTED_OPERATION_H
+#define GPARTED_OPERATION_H
 
 #include "../include/Device.h"
 #include "../include/OperationDetail.h"
@@ -68,4 +68,4 @@ protected:
 
 } //GParted
 
-#endif //OPERATION
+#endif /* GPARTED_OPERATION_H */

include/OperationChangeUUID.h

@@ -15,8 +15,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef OPERATIONCHANGEUUID_H_
-#define OPERATIONCHANGEUUID_H_
+#ifndef GPARTED_OPERATIONCHANGEUUID_H
+#define GPARTED_OPERATIONCHANGEUUID_H
 
 #include "../include/Operation.h"
 
@@ -39,4 +39,4 @@ private:
 
 } //GParted
 
-#endif //OPERATIONCHANGEUUID_H_
+#endif /* GPARTED_OPERATIONCHANGEUUID_H */

include/OperationCheck.h

@@ -15,8 +15,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef OPERATIONCHECK
-#define OPERATIONCHECK
+#ifndef GPARTED_OPERATIONCHECK_H
+#define GPARTED_OPERATIONCHECK_H
 
 #include "../include/Operation.h"
 
@@ -36,4 +36,4 @@ private:
 
 } //GParted
 
-#endif //OPERATIONCHECK
+#endif /* GPARTED_OPERATIONCHECK_H */

include/OperationCopy.h

@@ -15,8 +15,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef OPERATIONCOPY
-#define OPERATIONCOPY
+#ifndef GPARTED_OPERATIONCOPY_H
+#define GPARTED_OPERATIONCOPY_H
 
 #include "../include/Operation.h"
 
@@ -41,4 +41,4 @@ private:
 
 } //GParted
 
-#endif //OPERATIONCOPY
+#endif /* GPARTED_OPERATIONCOPY_H */

include/OperationCreate.h

@@ -15,8 +15,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef OPERATIONCREATE
-#define OPERATIONCREATE
+#ifndef GPARTED_OPERATIONCREATE_H
+#define GPARTED_OPERATIONCREATE_H
 
 #include "../include/Operation.h"
 
@@ -38,4 +38,4 @@ private:
 
 } //GParted
 
-#endif //OPERATIONCREATE
+#endif /* GPARTED_OPERATIONCREATE_H */

include/OperationDelete.h

@@ -15,8 +15,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef OPERATIONDELETE
-#define OPERATIONDELETE
+#ifndef GPARTED_OPERATIONDELETE_H
+#define GPARTED_OPERATIONDELETE_H
 
 #include "../include/Operation.h"
 
@@ -37,4 +37,4 @@ private:
 
 } //GParted
 
-#endif //OPERATIONDELETE
+#endif /* GPARTED_OPERATIONDELETE_H */

include/OperationDetail.h

@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef OPERATIONDETAIL
-#define OPERATIONDETAIL
+#ifndef GPARTED_OPERATIONDETAIL_H
+#define GPARTED_OPERATIONDETAIL_H
 
 #include <glibmm/ustring.h>
 #include <glibmm/markup.h>
@@ -86,6 +86,4 @@ private:
 
 } //GParted
 
-
-#endif //OPERATIONDETAIL
-
+#endif /* GPARTED_OPERATIONDETAIL_H */

include/OperationFormat.h

@@ -15,8 +15,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef OPERATIONFORMAT
-#define OPERATIONFORMAT
+#ifndef GPARTED_OPERATIONFORMAT_H
+#define GPARTED_OPERATIONFORMAT_H
 
 #include "../include/Operation.h"
 
@@ -38,4 +38,4 @@ private:
 
 } //GParted
 
-#endif //OPERATIONFORMAT
+#endif /* GPARTED_OPERATIONFORMAT_H */

include/OperationLabelPartition.h

@@ -14,9 +14,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
-#ifndef OPERATIONLABELPARTITION_H_
-#define OPERATIONLABELPARTITION_H_
+
+#ifndef GPARTED_OPERATIONLABELPARTITION_H
+#define GPARTED_OPERATIONLABELPARTITION_H
 
 #include "../include/Operation.h"
 
@@ -38,4 +38,4 @@ private:
 
 } //GParted
 
-#endif //OPERATIONLABELPARTITION_H_
+#endif /* GPARTED_OPERATIONLABELPARTITION_H */

include/OperationResizeMove.h

@@ -15,8 +15,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef OPERATIONRESIZEMOVE
-#define OPERATIONRESIZEMOVE
+#ifndef GPARTED_OPERATIONRESIZEMOVE_H
+#define GPARTED_OPERATIONRESIZEMOVE_H
 
 #include "../include/Operation.h"
 
@@ -43,4 +43,4 @@ private:
 
 } //GParted
 
-#endif //OPERATIONRESIZEMOVE
+#endif /* GPARTED_OPERATIONRESIZEMOVE_H */

include/Partition.h

@@ -20,9 +20,9 @@
   * Partition isn't really a partition. It's more like a geometry, a continuous part of the disk. 
   * I use it to represent partitions as well as unallocated spaces
   */
- 
-#ifndef PARTITION
-#define PARTITION
+
+#ifndef GPARTED_PARTITION_H
+#define GPARTED_PARTITION_H
 
 #include "../include/Utils.h"
 
@@ -151,4 +151,5 @@ private:
 };
 
 }//GParted
-#endif //PARTITION
+
+#endif /* GPARTED_PARTITION_H */

include/PipeCapture.h

@@ -15,8 +15,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef PIPECAPTURE_H
-#define PIPECAPTURE_H
+#ifndef GPARTED_PIPECAPTURE_H
+#define GPARTED_PIPECAPTURE_H
 
 #include <glibmm/ustring.h>
 #include <glibmm/main.h>
@@ -46,4 +46,4 @@ public:
 
 } // namepace GParted
 
-#endif
+#endif /* GPARTED_PIPECAPTURE_H */

include/Proc_Partitions_Info.h

@@ -22,8 +22,8 @@
  * that helps to minimize the number of required disk reads.
  */
 
-#ifndef PROC_PARTITONS_INFO_H_
-#define PROC_PARTITONS_INFO_H_
+#ifndef GPARTED_PROC_PARTITIONS_INFO_H
+#define GPARTED_PROC_PARTITIONS_INFO_H
 
 #include "../include/Utils.h"
 
@@ -47,4 +47,4 @@ private:
 
 }//GParted
 
-#endif /*PROC_PARTITONS_INFO_H_*/
+#endif /* GPARTED_PROC_PARTITIONS_INFO_H */

include/TreeView_Detail.h

@@ -14,9 +14,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
-#ifndef TREEVIEW_DETAIL
-#define TREEVIEW_DETAIL
+
+#ifndef GPARTED_TREEVIEW_DETAIL_H
+#define GPARTED_TREEVIEW_DETAIL_H
 
 #include "../include/Partition.h"
 
@@ -95,4 +95,4 @@ private:
 
 } //GParted
 
-#endif //TREEVIEW_DETAIL
+#endif /* GPARTED_TREEVIEW_DETAIL_H */

include/Utils.h

@@ -22,8 +22,8 @@
  * Some stuff i need in a lot of places so i dropped in all together in one file.
  */
 
-#ifndef UTILS
-#define UTILS
+#ifndef GPARTED_UTILS_H
+#define GPARTED_UTILS_H
 
 #include "../include/i18n.h"
 
@@ -199,4 +199,4 @@ private:
 
 }//GParted
 
-#endif //UTILS
+#endif /* GPARTED_UTILS_H */

include/Win_GParted.h

@@ -15,9 +15,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
-#ifndef WIN_GPARTED
-#define WIN_GPARTED
+
+#ifndef GPARTED_WIN_GPARTED_H
+#define GPARTED_WIN_GPARTED_H
 
 #include "../include/Device.h"
 #include "../include/DrawingAreaVisualDisk.h"
@@ -262,4 +262,4 @@ private:
 
 } //GParted
 
-#endif //WIN_GPARTED
+#endif /* GPARTED_WIN_GPARTED_H */

include/btrfs.h

@@ -17,8 +17,8 @@
  */
 
 
-#ifndef BTRFS_H_
-#define BTRFS_H_
+#ifndef GPARTED_BTRFS_H
+#define GPARTED_BTRFS_H
 
 #include "../include/FileSystem.h"
 
@@ -43,4 +43,4 @@ private:
 };
 } //GParted
 
-#endif //BTRFS_H_
+#endif /* GPARTED_BTRFS_H */

include/exfat.h

@@ -16,8 +16,8 @@
  */
 
 
-#ifndef EXFAT_H_
-#define EXFAT_H_
+#ifndef GPARTED_EXFAT_H
+#define GPARTED_EXFAT_H
 
 #include "../include/FileSystem.h"
 
@@ -32,4 +32,4 @@ public:
 
 } //GParted
 
-#endif /* EXFAT_H_ */
+#endif /* GPARTED_EXFAT_H */

include/ext2.h

@@ -15,10 +15,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
- 
-#ifndef DEFINE_EXT2
-#define DEFINE_EXT2
+
+
+#ifndef GPARTED_EXT2_H
+#define GPARTED_EXT2_H
 
 #include "../include/FileSystem.h"
 
@@ -43,4 +43,4 @@ public:
 
 } //GParted
 
-#endif //EXT2
+#endif /* GPARTED_EXT2_H */

include/f2fs.h

@@ -16,8 +16,8 @@
  */
 
 
-#ifndef F2FS_H_
-#define F2FS_H_
+#ifndef GPARTED_F2FS_H
+#define GPARTED_F2FS_H
 
 #include "../include/FileSystem.h"
 
@@ -33,4 +33,4 @@ public:
 
 } //GParted
 
-#endif /* F2FS_H_ */
+#endif /* GPARTED_F2FS_H */

include/fat16.h

@@ -15,10 +15,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
- 
-#ifndef DEFINE_FAT16
-#define DEFINE_FAT16
+
+
+#ifndef GPARTED_FAT16_H
+#define GPARTED_FAT16_H
 
 #include "../include/FileSystem.h"
 
@@ -47,4 +47,4 @@ private:
 
 } //GParted
 
-#endif //FAT16
+#endif /* GPARTED_FAT16_H */

include/hfs.h

@@ -15,10 +15,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
- 
-#ifndef DEFINE_HFS
-#define DEFINE_HFS
+
+
+#ifndef GPARTED_HFS_H
+#define GPARTED_HFS_H
 
 #include "../include/FileSystem.h"
 
@@ -36,4 +36,4 @@ public:
 
 } //GParted
 
-#endif //HFS
+#endif /* GPARTED_HFS_H */

include/hfsplus.h

@@ -15,10 +15,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
- 
-#ifndef DEFINE_HFSPLUS
-#define DEFINE_HFSPLUS
+
+
+#ifndef GPARTED_HFSPLUS_H
+#define GPARTED_HFSPLUS_H
 
 #include "../include/FileSystem.h"
 
@@ -36,4 +36,4 @@ public:
 
 } //GParted
 
-#endif //HFSPLUS
+#endif /* GPARTED_HFSPLUS_H */

include/i18n.h

@@ -1,5 +1,5 @@
-#ifndef I18N 
-#define I18N
+#ifndef GPARTED_I18N_H
+#define GPARTED_I18N_H
 
 	#ifdef HAVE_CONFIG_H
 		#include "config.h"
@@ -12,4 +12,4 @@
 		#include "../compose/ucompose.hpp"
 	#endif /* ENABLE_NLS */
 
-#endif /* I18N */
+#endif /* GPARTED_I18N_H */

include/jfs.h

@@ -15,10 +15,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
- 
-#ifndef DEFINE_JFS
-#define DEFINE_JFS
+
+
+#ifndef GPARTED_JFS_H
+#define GPARTED_JFS_H
 
 #include "../include/FileSystem.h"
 
@@ -41,4 +41,4 @@ public:
 
 } //GParted
 
-#endif //JFS
+#endif /* GPARTED_JFS_H */

include/linux_swap.h

@@ -15,10 +15,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
- 
-#ifndef DEFINE_LINUX_SWAP
-#define DEFINE_LINUX_SWAP
+
+
+#ifndef GPARTED_LINUX_SWAP_H
+#define GPARTED_LINUX_SWAP_H
 
 #include "../include/FileSystem.h"
 
@@ -48,4 +48,4 @@ public:
 
 } //GParted
 
-#endif //LINUX_SWAP
+#endif /* GPARTED_LINUX_SWAP_H */

include/lvm2_pv.h

@@ -16,8 +16,8 @@
  */
 
 
-#ifndef LVM2_PV_H_
-#define LVM2_PV_H_
+#ifndef GPARTED_LVM2_PV_H
+#define GPARTED_LVM2_PV_H
 
 #include "../include/FileSystem.h"
 
@@ -38,4 +38,4 @@ public:
 
 } //GParted
 
-#endif /*LVM2_PV_H_*/
+#endif /* GPARTED_LVM2_PV_H */

include/nilfs2.h

@@ -16,8 +16,8 @@
  */
 
 
-#ifndef NILFS2_H_
-#define NILFS2_H_
+#ifndef GPARTED_NILFS2_H
+#define GPARTED_NILFS2_H
 
 #include "../include/FileSystem.h"
 
@@ -39,4 +39,4 @@ public:
 
 } //GParted
 
-#endif /*NILFS2_H_*/
+#endif /* GPARTED_NILFS2_H */

include/ntfs.h

@@ -15,10 +15,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
- 
-#ifndef DEFINE_NTFS
-#define DEFINE_NTFS
+
+
+#ifndef GPARTED_NTFS_H
+#define GPARTED_NTFS_H
 
 #include "../include/FileSystem.h"
 
@@ -47,4 +47,4 @@ public:
 
 } //GParted
 
-#endif //NTFS
+#endif /* GPARTED_NTFS_H */

include/reiser4.h

@@ -15,10 +15,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
- 
-#ifndef DEFINE_REISER4
-#define DEFINE_REISER4
+
+
+#ifndef GPARTED_REISER4_H
+#define GPARTED_REISER4_H
 
 #include "../include/FileSystem.h"
 
@@ -38,4 +38,4 @@ public:
 
 } //GParted
 
-#endif //REISER4
+#endif /* GPARTED_REISER4_H */

include/reiserfs.h

@@ -15,10 +15,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
- 
-#ifndef DEFINE_REISERFS
-#define DEFINE_REISERFS
+
+
+#ifndef GPARTED_REISERFS_H
+#define GPARTED_REISERFS_H
 
 #include "../include/FileSystem.h"
 
@@ -41,4 +41,4 @@ public:
 
 } //GParted
 
-#endif //REISERFS
+#endif /* GPARTED_REISERFS_H */

include/ufs.h

@@ -15,10 +15,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
- 
-#ifndef DEFINE_UFS
-#define DEFINE_UFS
+
+
+#ifndef GPARTED_UFS_H
+#define GPARTED_UFS_H
 
 #include "../include/FileSystem.h"
 
@@ -33,4 +33,4 @@ public:
 
 } //GParted
 
-#endif //UFS
+#endif /* GPARTED_UFS_H */

include/xfs.h

@@ -15,10 +15,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
- 
-#ifndef DEFINE_XFS
-#define DEFINE_XFS
+
+
+#ifndef GPARTED_XFS_H
+#define GPARTED_XFS_H
 
 #include "../include/FileSystem.h"
 
@@ -44,4 +44,4 @@ public:
 
 } //GParted
 
-#endif //XFS
+#endif /* GPARTED_XFS_H */