[gparted] Make include guards unique (#539297)
- From: Curtis Gedak <gedakc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gparted] Make include guards unique (#539297)
- Date: Wed, 5 Jun 2013 19:29:45 +0000 (UTC)
commit 2b51d8714739d5ed55c9e08b70ba99e4b14c19af
Author: Mike Fleetwood <mike fleetwood googlemail com>
Date: Mon May 27 12:20:16 2013 +0100
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 | 6 +++---
include/DMRaid.h | 6 +++---
include/Device.h | 10 +++++-----
include/DialogFeatures.h | 8 ++++----
include/DialogManageFlags.h | 9 ++++-----
include/Dialog_Base_Partition.h | 8 ++++----
include/Dialog_Disklabel.h | 9 ++++-----
include/Dialog_Partition_Copy.h | 8 ++++----
include/Dialog_Partition_Info.h | 6 +++---
include/Dialog_Partition_Label.h | 8 ++++----
include/Dialog_Partition_New.h | 8 ++++----
include/Dialog_Partition_Resize_Move.h | 6 +++---
include/Dialog_Progress.h | 6 +++---
include/Dialog_Rescue_Data.h | 7 +++----
include/DrawingAreaVisualDisk.h | 7 ++++---
include/FS_Info.h | 6 +++---
include/FileSystem.h | 10 +++++-----
include/Frame_Resizer_Base.h | 8 ++++----
include/Frame_Resizer_Extended.h | 10 +++++-----
include/GParted_Core.h | 9 ++++-----
include/HBoxOperations.h | 8 ++++----
include/LVM2_PV_Info.h | 6 +++---
include/Operation.h | 6 +++---
include/OperationChangeUUID.h | 6 +++---
include/OperationCheck.h | 6 +++---
include/OperationCopy.h | 6 +++---
include/OperationCreate.h | 6 +++---
include/OperationDelete.h | 6 +++---
include/OperationDetail.h | 8 +++-----
include/OperationFormat.h | 6 +++---
include/OperationLabelPartition.h | 8 ++++----
include/OperationResizeMove.h | 6 +++---
include/Partition.h | 9 +++++----
include/PipeCapture.h | 6 +++---
include/Proc_Partitions_Info.h | 6 +++---
include/TreeView_Detail.h | 8 ++++----
include/Utils.h | 6 +++---
include/Win_GParted.h | 8 ++++----
include/btrfs.h | 6 +++---
include/exfat.h | 6 +++---
include/ext2.h | 10 +++++-----
include/f2fs.h | 6 +++---
include/fat16.h | 10 +++++-----
include/hfs.h | 10 +++++-----
include/hfsplus.h | 10 +++++-----
include/i18n.h | 6 +++---
include/jfs.h | 10 +++++-----
include/linux_swap.h | 10 +++++-----
include/lvm2_pv.h | 6 +++---
include/nilfs2.h | 6 +++---
include/ntfs.h | 10 +++++-----
include/reiser4.h | 10 +++++-----
include/reiserfs.h | 10 +++++-----
include/ufs.h | 10 +++++-----
include/xfs.h | 10 +++++-----
55 files changed, 209 insertions(+), 213 deletions(-)
---
diff --git a/include/Copy_Blocks.h b/include/Copy_Blocks.h
index 7e09901..fcf79cd 100644
--- a/include/Copy_Blocks.h
+++ b/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 */
diff --git a/include/DMRaid.h b/include/DMRaid.h
index 0a52ce1..8ee58aa 100644
--- a/include/DMRaid.h
+++ b/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 */
diff --git a/include/Device.h b/include/Device.h
index 6a732b7..1a45ba3 100644
--- a/include/Device.h
+++ b/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 */
diff --git a/include/DialogFeatures.h b/include/DialogFeatures.h
index 6fb256d..4a7521e 100644
--- a/include/DialogFeatures.h
+++ b/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 */
diff --git a/include/DialogManageFlags.h b/include/DialogManageFlags.h
index 887f2c1..0caf3b5 100644
--- a/include/DialogManageFlags.h
+++ b/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 */
diff --git a/include/Dialog_Base_Partition.h b/include/Dialog_Base_Partition.h
index 56e5ebd..622eedc 100644
--- a/include/Dialog_Base_Partition.h
+++ b/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 */
diff --git a/include/Dialog_Disklabel.h b/include/Dialog_Disklabel.h
index acee131..8ce6fcc 100644
--- a/include/Dialog_Disklabel.h
+++ b/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 */
diff --git a/include/Dialog_Partition_Copy.h b/include/Dialog_Partition_Copy.h
index c34ff15..7e5ee58 100644
--- a/include/Dialog_Partition_Copy.h
+++ b/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 */
diff --git a/include/Dialog_Partition_Info.h b/include/Dialog_Partition_Info.h
index 7326f59..ccb9b9f 100644
--- a/include/Dialog_Partition_Info.h
+++ b/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 */
diff --git a/include/Dialog_Partition_Label.h b/include/Dialog_Partition_Label.h
index 2cee7c6..1276da5 100644
--- a/include/Dialog_Partition_Label.h
+++ b/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 */
diff --git a/include/Dialog_Partition_New.h b/include/Dialog_Partition_New.h
index 7711edf..0a098ad 100644
--- a/include/Dialog_Partition_New.h
+++ b/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 */
diff --git a/include/Dialog_Partition_Resize_Move.h b/include/Dialog_Partition_Resize_Move.h
index c6b65e0..831a9c4 100644
--- a/include/Dialog_Partition_Resize_Move.h
+++ b/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 */
diff --git a/include/Dialog_Progress.h b/include/Dialog_Progress.h
index 960979e..7af8097 100644
--- a/include/Dialog_Progress.h
+++ b/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 */
diff --git a/include/Dialog_Rescue_Data.h b/include/Dialog_Rescue_Data.h
index b7ca417..b26b1bf 100644
--- a/include/Dialog_Rescue_Data.h
+++ b/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 */
diff --git a/include/DrawingAreaVisualDisk.h b/include/DrawingAreaVisualDisk.h
index a96bbed..9dceb27 100644
--- a/include/DrawingAreaVisualDisk.h
+++ b/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 */
diff --git a/include/FS_Info.h b/include/FS_Info.h
index da9603d..f8bd842 100644
--- a/include/FS_Info.h
+++ b/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 */
diff --git a/include/FileSystem.h b/include/FileSystem.h
index 4092ed8..a19aa15 100644
--- a/include/FileSystem.h
+++ b/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 */
diff --git a/include/Frame_Resizer_Base.h b/include/Frame_Resizer_Base.h
index 7aedecb..3c2be0d 100644
--- a/include/Frame_Resizer_Base.h
+++ b/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 */
diff --git a/include/Frame_Resizer_Extended.h b/include/Frame_Resizer_Extended.h
index 1287ce9..fa6ca01 100644
--- a/include/Frame_Resizer_Extended.h
+++ b/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 */
diff --git a/include/GParted_Core.h b/include/GParted_Core.h
index 50b1bda..52f703c 100644
--- a/include/GParted_Core.h
+++ b/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 */
diff --git a/include/HBoxOperations.h b/include/HBoxOperations.h
index e624173..3d4a4ec 100644
--- a/include/HBoxOperations.h
+++ b/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 */
diff --git a/include/LVM2_PV_Info.h b/include/LVM2_PV_Info.h
index cd531d6..4f7e699 100644
--- a/include/LVM2_PV_Info.h
+++ b/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 */
diff --git a/include/Operation.h b/include/Operation.h
index 669b8b6..d0129b5 100644
--- a/include/Operation.h
+++ b/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 */
diff --git a/include/OperationChangeUUID.h b/include/OperationChangeUUID.h
index 2de424f..848bda5 100644
--- a/include/OperationChangeUUID.h
+++ b/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 */
diff --git a/include/OperationCheck.h b/include/OperationCheck.h
index cbc160a..d08d0ed 100644
--- a/include/OperationCheck.h
+++ b/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 */
diff --git a/include/OperationCopy.h b/include/OperationCopy.h
index ec656b7..a375007 100644
--- a/include/OperationCopy.h
+++ b/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 */
diff --git a/include/OperationCreate.h b/include/OperationCreate.h
index f7a2590..5fdb78b 100644
--- a/include/OperationCreate.h
+++ b/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 */
diff --git a/include/OperationDelete.h b/include/OperationDelete.h
index 377354f..c09ef1d 100644
--- a/include/OperationDelete.h
+++ b/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 */
diff --git a/include/OperationDetail.h b/include/OperationDetail.h
index fa9f806..4d7639b 100644
--- a/include/OperationDetail.h
+++ b/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 */
diff --git a/include/OperationFormat.h b/include/OperationFormat.h
index 72d9e8b..6c54a40 100644
--- a/include/OperationFormat.h
+++ b/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 */
diff --git a/include/OperationLabelPartition.h b/include/OperationLabelPartition.h
index 5ee062a..17ee249 100644
--- a/include/OperationLabelPartition.h
+++ b/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 */
diff --git a/include/OperationResizeMove.h b/include/OperationResizeMove.h
index 328d8a6..81d932e 100644
--- a/include/OperationResizeMove.h
+++ b/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 */
diff --git a/include/Partition.h b/include/Partition.h
index 29f4993..f7766d1 100644
--- a/include/Partition.h
+++ b/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 */
diff --git a/include/PipeCapture.h b/include/PipeCapture.h
index b6552c9..25b9697 100644
--- a/include/PipeCapture.h
+++ b/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 */
diff --git a/include/Proc_Partitions_Info.h b/include/Proc_Partitions_Info.h
index 9fe17d1..9c48095 100644
--- a/include/Proc_Partitions_Info.h
+++ b/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 */
diff --git a/include/TreeView_Detail.h b/include/TreeView_Detail.h
index f197435..d8aec14 100644
--- a/include/TreeView_Detail.h
+++ b/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 */
diff --git a/include/Utils.h b/include/Utils.h
index 877327d..62f8ba8 100644
--- a/include/Utils.h
+++ b/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 */
diff --git a/include/Win_GParted.h b/include/Win_GParted.h
index 05c1595..eb56b31 100644
--- a/include/Win_GParted.h
+++ b/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 */
diff --git a/include/btrfs.h b/include/btrfs.h
index 9cc59b3..0c989e3 100644
--- a/include/btrfs.h
+++ b/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 */
diff --git a/include/exfat.h b/include/exfat.h
index 1d37409..1c01126 100644
--- a/include/exfat.h
+++ b/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 */
diff --git a/include/ext2.h b/include/ext2.h
index 5e4b53b..591a393 100644
--- a/include/ext2.h
+++ b/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 */
diff --git a/include/f2fs.h b/include/f2fs.h
index 251f71d..8e4e057 100644
--- a/include/f2fs.h
+++ b/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 */
diff --git a/include/fat16.h b/include/fat16.h
index 59c9497..13e88a4 100644
--- a/include/fat16.h
+++ b/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 */
diff --git a/include/hfs.h b/include/hfs.h
index 97895d7..5e8edd6 100644
--- a/include/hfs.h
+++ b/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 */
diff --git a/include/hfsplus.h b/include/hfsplus.h
index 7d205cf..e4420fb 100644
--- a/include/hfsplus.h
+++ b/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 */
diff --git a/include/i18n.h b/include/i18n.h
index 516c367..424dd6e 100644
--- a/include/i18n.h
+++ b/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 */
diff --git a/include/jfs.h b/include/jfs.h
index ca86f41..e6b60c5 100644
--- a/include/jfs.h
+++ b/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 */
diff --git a/include/linux_swap.h b/include/linux_swap.h
index c4be64c..1b3e485 100644
--- a/include/linux_swap.h
+++ b/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 */
diff --git a/include/lvm2_pv.h b/include/lvm2_pv.h
index 3dbc7de..7369f31 100644
--- a/include/lvm2_pv.h
+++ b/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 */
diff --git a/include/nilfs2.h b/include/nilfs2.h
index bffce4b..5d77376 100644
--- a/include/nilfs2.h
+++ b/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 */
diff --git a/include/ntfs.h b/include/ntfs.h
index 367c488..a662114 100644
--- a/include/ntfs.h
+++ b/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 */
diff --git a/include/reiser4.h b/include/reiser4.h
index befebf5..f83b8e4 100644
--- a/include/reiser4.h
+++ b/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 */
diff --git a/include/reiserfs.h b/include/reiserfs.h
index f2a395f..dc977ad 100644
--- a/include/reiserfs.h
+++ b/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 */
diff --git a/include/ufs.h b/include/ufs.h
index 74ccfa7..be2e99f 100644
--- a/include/ufs.h
+++ b/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 */
diff --git a/include/xfs.h b/include/xfs.h
index faa6872..c65134e 100644
--- a/include/xfs.h
+++ b/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 */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
