diff --git a/src/config/advancedpagewidget.h b/src/config/advancedpagewidget.h
index dedb9b3..621efa0 100644
--- a/src/config/advancedpagewidget.h
+++ b/src/config/advancedpagewidget.h
@@ -16,9 +16,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(ADVANCEDPAGEWIDGET__H)
+#if !defined(ADVANCEDPAGEWIDGET_H)
-#define ADVANCEDPAGEWIDGET__H
+#define ADVANCEDPAGEWIDGET_H
#include "ui_configurepageadvanced.h"
diff --git a/src/config/configureoptionsdialog.h b/src/config/configureoptionsdialog.h
index bff5aac..718445d 100644
--- a/src/config/configureoptionsdialog.h
+++ b/src/config/configureoptionsdialog.h
@@ -16,9 +16,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(CONFIGUREOPTIONSDIALOG__H)
+#if !defined(CONFIGUREOPTIONSDIALOG_H)
-#define CONFIGUREOPTIONSDIALOG__H
+#define CONFIGUREOPTIONSDIALOG_H
#include
diff --git a/src/config/filesystemcolorspagewidget.h b/src/config/filesystemcolorspagewidget.h
index dfd42a5..fd23c92 100644
--- a/src/config/filesystemcolorspagewidget.h
+++ b/src/config/filesystemcolorspagewidget.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(FILESYSTEMCOLORSPAGEWIDGET__H)
+#if !defined(FILESYSTEMCOLORSPAGEWIDGET_H)
-#define FILESYSTEMCOLORSPAGEWIDGET__H
+#define FILESYSTEMCOLORSPAGEWIDGET_H
#include "ui_configurepagefilesystemcolors.h"
diff --git a/src/config/generalpagewidget.h b/src/config/generalpagewidget.h
index 6911153..52de33e 100644
--- a/src/config/generalpagewidget.h
+++ b/src/config/generalpagewidget.h
@@ -16,9 +16,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(GENERALPAGEWIDGET__H)
+#if !defined(GENERALPAGEWIDGET_H)
-#define GENERALPAGEWIDGET__H
+#define GENERALPAGEWIDGET_H
#include "ui_configurepagegeneral.h"
diff --git a/src/gui/applyprogressdetailswidget.h b/src/gui/applyprogressdetailswidget.h
index 2de4bac..d1a8f70 100644
--- a/src/gui/applyprogressdetailswidget.h
+++ b/src/gui/applyprogressdetailswidget.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(APPLYPROGRESSDETAILSWIDGET__H)
+#if !defined(APPLYPROGRESSDETAILSWIDGET_H)
-#define APPLYPROGRESSDETAILSWIDGET__H
+#define APPLYPROGRESSDETAILSWIDGET_H
#include "ui_applyprogressdetailswidgetbase.h"
diff --git a/src/gui/applyprogressdialog.h b/src/gui/applyprogressdialog.h
index 9169f6f..0277faa 100644
--- a/src/gui/applyprogressdialog.h
+++ b/src/gui/applyprogressdialog.h
@@ -16,9 +16,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(APPLYPROGRESSDIALOG__H)
+#if !defined(APPLYPROGRESSDIALOG_H)
-#define APPLYPROGRESSDIALOG__H
+#define APPLYPROGRESSDIALOG_H
#include
#include
diff --git a/src/gui/applyprogressdialogwidget.h b/src/gui/applyprogressdialogwidget.h
index dd35838..9961f34 100644
--- a/src/gui/applyprogressdialogwidget.h
+++ b/src/gui/applyprogressdialogwidget.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(APPLYPROGRESSDIALOGWIDGET__H)
+#if !defined(APPLYPROGRESSDIALOGWIDGET_H)
-#define APPLYPROGRESSDIALOGWIDGET__H
+#define APPLYPROGRESSDIALOGWIDGET_H
#include "ui_applyprogressdialogwidgetbase.h"
diff --git a/src/gui/createpartitiontabledialog.h b/src/gui/createpartitiontabledialog.h
index c0471dc..508ae88 100644
--- a/src/gui/createpartitiontabledialog.h
+++ b/src/gui/createpartitiontabledialog.h
@@ -16,9 +16,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(CREATEPARTITIONTABLEDIALOG__H)
+#if !defined(CREATEPARTITIONTABLEDIALOG_H)
-#define CREATEPARTITIONTABLEDIALOG__H
+#define CREATEPARTITIONTABLEDIALOG_H
#include "gui/createpartitiontablewidget.h"
diff --git a/src/gui/createpartitiontablewidget.h b/src/gui/createpartitiontablewidget.h
index 87b2fb4..6ff0973 100644
--- a/src/gui/createpartitiontablewidget.h
+++ b/src/gui/createpartitiontablewidget.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(CREATEPARTITIONTABLEWIDGET__H)
+#if !defined(CREATEPARTITIONTABLEWIDGET_H)
-#define CREATEPARTITIONTABLEWIDGET__H
+#define CREATEPARTITIONTABLEWIDGET_H
#include "ui_createpartitiontablewidgetbase.h"
diff --git a/src/gui/createvolumegroupdialog.h b/src/gui/createvolumegroupdialog.h
index 6186771..70d4867 100644
--- a/src/gui/createvolumegroupdialog.h
+++ b/src/gui/createvolumegroupdialog.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(CREATEVOLUMEGROUPDIALOG__H)
+#if !defined(CREATEVOLUMEGROUPDIALOG_H)
-#define CREATEVOLUMEGROUPDIALOG__H
+#define CREATEVOLUMEGROUPDIALOG_H
#include
#include
diff --git a/src/gui/devicepropsdialog.h b/src/gui/devicepropsdialog.h
index 9fd668e..36c7304 100644
--- a/src/gui/devicepropsdialog.h
+++ b/src/gui/devicepropsdialog.h
@@ -16,9 +16,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(DEVICEPROPSDIALOG__H)
+#if !defined(DEVICEPROPSDIALOG_H)
-#define DEVICEPROPSDIALOG__H
+#define DEVICEPROPSDIALOG_H
#include
diff --git a/src/gui/devicepropswidget.h b/src/gui/devicepropswidget.h
index 660756b..9b617ee 100644
--- a/src/gui/devicepropswidget.h
+++ b/src/gui/devicepropswidget.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(DEVICEPROPSWIDGET__H)
+#if !defined(DEVICEPROPSWIDGET_H)
-#define DEVICEPROPSWIDGET__H
+#define DEVICEPROPSWIDGET_H
#include "ui_devicepropswidgetbase.h"
diff --git a/src/gui/editmountoptionsdialog.h b/src/gui/editmountoptionsdialog.h
index a5102ec..65b1217 100644
--- a/src/gui/editmountoptionsdialog.h
+++ b/src/gui/editmountoptionsdialog.h
@@ -16,9 +16,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(EDITMOUNTOPTIONSDIALOG__H)
+#if !defined(EDITMOUNTOPTIONSDIALOG_H)
-#define EDITMOUNTOPTIONSDIALOG__H
+#define EDITMOUNTOPTIONSDIALOG_H
#include
diff --git a/src/gui/editmountoptionsdialogwidget.h b/src/gui/editmountoptionsdialogwidget.h
index 34f7cce..d3b3b08 100644
--- a/src/gui/editmountoptionsdialogwidget.h
+++ b/src/gui/editmountoptionsdialogwidget.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(EDITMOUNTOPTIONSDIALOGWIDGET__H)
+#if !defined(EDITMOUNTOPTIONSDIALOGWIDGET_H)
-#define EDITMOUNTOPTIONSDIALOGWIDGET__H
+#define EDITMOUNTOPTIONSDIALOGWIDGET_H
#include "ui_editmountoptionsdialogwidgetbase.h"
diff --git a/src/gui/editmountpointdialog.h b/src/gui/editmountpointdialog.h
index 1028d72..0b64243 100644
--- a/src/gui/editmountpointdialog.h
+++ b/src/gui/editmountpointdialog.h
@@ -16,9 +16,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(EDITMOUNTPOINTDIALOG__H)
+#if !defined(EDITMOUNTPOINTDIALOG_H)
-#define EDITMOUNTPOINTDIALOG__H
+#define EDITMOUNTPOINTDIALOG_H
#include
diff --git a/src/gui/editmountpointdialogwidget.h b/src/gui/editmountpointdialogwidget.h
index 03a5e87..6445da4 100644
--- a/src/gui/editmountpointdialogwidget.h
+++ b/src/gui/editmountpointdialogwidget.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(EDITMOUNTPOINTDIALOGWIDGET__H)
+#if !defined(EDITMOUNTPOINTDIALOGWIDGET_H)
-#define EDITMOUNTPOINTDIALOGWIDGET__H
+#define EDITMOUNTPOINTDIALOGWIDGET_H
#include "ui_editmountpointdialogwidgetbase.h"
diff --git a/src/gui/filesystemsupportdialog.h b/src/gui/filesystemsupportdialog.h
index db8943c..8a6c0fd 100644
--- a/src/gui/filesystemsupportdialog.h
+++ b/src/gui/filesystemsupportdialog.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(FILESYSTEMSUPPORTDIALOG__H)
+#if !defined(FILESYSTEMSUPPORTDIALOG_H)
-#define FILESYSTEMSUPPORTDIALOG__H
+#define FILESYSTEMSUPPORTDIALOG_H
#include
#include
diff --git a/src/gui/filesystemsupportdialogwidget.h b/src/gui/filesystemsupportdialogwidget.h
index f1eb959..302776d 100644
--- a/src/gui/filesystemsupportdialogwidget.h
+++ b/src/gui/filesystemsupportdialogwidget.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(FILESYSTEMSUPPORTDIALOGWIDGET__H)
+#if !defined(FILESYSTEMSUPPORTDIALOGWIDGET_H)
-#define FILESYSTEMSUPPORTDIALOGWIDGET__H
+#define FILESYSTEMSUPPORTDIALOGWIDGET_H
#include "ui_filesystemsupportdialogwidgetbase.h"
diff --git a/src/gui/formattedspinbox.h b/src/gui/formattedspinbox.h
index 2c30039..c8996e9 100644
--- a/src/gui/formattedspinbox.h
+++ b/src/gui/formattedspinbox.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(FORMATTEDSPINBOX__H)
+#if !defined(FORMATTEDSPINBOX_H)
-#define FORMATTEDSPINBOX__H
+#define FORMATTEDSPINBOX_H
#include
diff --git a/src/gui/infopane.h b/src/gui/infopane.h
index b7f0f4f..aadb38b 100644
--- a/src/gui/infopane.h
+++ b/src/gui/infopane.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(INFOPANE__H)
+#if !defined(INFOPANE_H)
-#define INFOPANE__H
+#define INFOPANE_H
#include
diff --git a/src/gui/insertdialog.h b/src/gui/insertdialog.h
index 4bbe4e6..89697f9 100644
--- a/src/gui/insertdialog.h
+++ b/src/gui/insertdialog.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(INSERTDIALOG__H)
+#if !defined(INSERTDIALOG_H)
-#define INSERTDIALOG__H
+#define INSERTDIALOG_H
#include "gui/sizedialogbase.h"
diff --git a/src/gui/listdevices.h b/src/gui/listdevices.h
index 3f2dcae..6aee317 100644
--- a/src/gui/listdevices.h
+++ b/src/gui/listdevices.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(LISTDEVICES__H)
+#if !defined(LISTDEVICES_H)
-#define LISTDEVICES__H
+#define LISTDEVICES_H
#include
diff --git a/src/gui/listoperations.h b/src/gui/listoperations.h
index 492aaf8..9e63642 100644
--- a/src/gui/listoperations.h
+++ b/src/gui/listoperations.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(LISTOPERATIONS__H)
+#if !defined(LISTOPERATIONS_H)
-#define LISTOPERATIONS__H
+#define LISTOPERATIONS_H
#include
diff --git a/src/gui/listphysicalvolumes.h b/src/gui/listphysicalvolumes.h
index a97466d..7060c75 100644
--- a/src/gui/listphysicalvolumes.h
+++ b/src/gui/listphysicalvolumes.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(LISTPHYSICALVOLUMES__H)
+#if !defined(LISTPHYSICALVOLUMES_H)
-#define LISTPHYSICALVOLUMES__H
+#define LISTPHYSICALVOLUMES_H
#include "ui_listphysicalvolumesbase.h"
diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 100ff27..8615006 100644
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -16,9 +16,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(MAINWINDOW__H)
+#if !defined(MAINWINDOW_H)
-#define MAINWINDOW__H
+#define MAINWINDOW_H
#include
#include
diff --git a/src/gui/newdialog.h b/src/gui/newdialog.h
index d0cc477..7f5a027 100644
--- a/src/gui/newdialog.h
+++ b/src/gui/newdialog.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(NEWDIALOG__H)
+#if !defined(NEWDIALOG_H)
-#define NEWDIALOG__H
+#define NEWDIALOG_H
#include "gui/sizedialogbase.h"
diff --git a/src/gui/partitionmanagerwidget.h b/src/gui/partitionmanagerwidget.h
index 87e79d6..ec5c841 100644
--- a/src/gui/partitionmanagerwidget.h
+++ b/src/gui/partitionmanagerwidget.h
@@ -16,9 +16,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(PARTITIONMANAGERWIDGET__H)
+#if !defined(PARTITIONMANAGERWIDGET_H)
-#define PARTITIONMANAGERWIDGET__H
+#define PARTITIONMANAGERWIDGET_H
#include
#include
diff --git a/src/gui/partpropsdialog.h b/src/gui/partpropsdialog.h
index 862264f..6c178f6 100644
--- a/src/gui/partpropsdialog.h
+++ b/src/gui/partpropsdialog.h
@@ -16,9 +16,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(PARTPROPSDIALOG__H)
+#if !defined(PARTPROPSDIALOG_H)
-#define PARTPROPSDIALOG__H
+#define PARTPROPSDIALOG_H
#include
diff --git a/src/gui/partpropswidget.h b/src/gui/partpropswidget.h
index 70b29fa..5146217 100644
--- a/src/gui/partpropswidget.h
+++ b/src/gui/partpropswidget.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(PARTPROPSWIDGET__H)
+#if !defined(PARTPROPSWIDGET_H)
-#define PARTPROPSWIDGET__H
+#define PARTPROPSWIDGET_H
#include "ui_partpropswidgetbase.h"
diff --git a/src/gui/parttablewidget.h b/src/gui/parttablewidget.h
index cb6465a..4e4061c 100644
--- a/src/gui/parttablewidget.h
+++ b/src/gui/parttablewidget.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(PARTTABLEWIDGET__H)
+#if !defined(PARTTABLEWIDGET_H)
-#define PARTTABLEWIDGET__H
+#define PARTTABLEWIDGET_H
#include
diff --git a/src/gui/resizedialog.h b/src/gui/resizedialog.h
index 42f3222..d538dcf 100644
--- a/src/gui/resizedialog.h
+++ b/src/gui/resizedialog.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(RESIZEDIALOG__H)
+#if !defined(RESIZEDIALOG_H)
-#define RESIZEDIALOG__H
+#define RESIZEDIALOG_H
#include "gui/sizedialogbase.h"
diff --git a/src/gui/resizevolumegroupdialog.h b/src/gui/resizevolumegroupdialog.h
index 15e0a3f..138161a 100644
--- a/src/gui/resizevolumegroupdialog.h
+++ b/src/gui/resizevolumegroupdialog.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(RESIZEVOLUMEGROUPDIALOG__H)
+#if !defined(RESIZEVOLUMEGROUPDIALOG_H)
-#define RESIZEVOLUMEGROUPDIALOG__H
+#define RESIZEVOLUMEGROUPDIALOG_H
#include
diff --git a/src/gui/scanprogressdialog.h b/src/gui/scanprogressdialog.h
index e94a166..27f46c1 100644
--- a/src/gui/scanprogressdialog.h
+++ b/src/gui/scanprogressdialog.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(SCANPROGRESSDIALOG__H)
+#if !defined(SCANPROGRESSDIALOG_H)
-#define SCANPROGRESSDIALOG__H
+#define SCANPROGRESSDIALOG_H
#include
diff --git a/src/gui/sizedetailswidget.h b/src/gui/sizedetailswidget.h
index f809037..98ba813 100644
--- a/src/gui/sizedetailswidget.h
+++ b/src/gui/sizedetailswidget.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(SIZEDETAILSWIDGET__H)
+#if !defined(SIZEDETAILSWIDGET_H)
-#define SIZEDETAILSWIDGET__H
+#define SIZEDETAILSWIDGET_H
#include "ui_sizedetailswidgetbase.h"
diff --git a/src/gui/sizedialogbase.h b/src/gui/sizedialogbase.h
index 1129418..66e5640 100644
--- a/src/gui/sizedialogbase.h
+++ b/src/gui/sizedialogbase.h
@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(SIZEDIALOGBASE__H)
+#if !defined(SIZEDIALOGBASE_H)
-#define SIZEDIALOGBASE__H
+#define SIZEDIALOGBASE_H
#include
diff --git a/src/gui/sizedialogwidget.h b/src/gui/sizedialogwidget.h
index 2b7ec5b..94f0c55 100644
--- a/src/gui/sizedialogwidget.h
+++ b/src/gui/sizedialogwidget.h
@@ -16,9 +16,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(SIZEDIALOGWIDGET__H)
+#if !defined(SIZEDIALOGWIDGET_H)
-#define SIZEDIALOGWIDGET__H
+#define SIZEDIALOGWIDGET_H
#include "ui_sizedialogwidgetbase.h"
diff --git a/src/gui/smartdialog.h b/src/gui/smartdialog.h
index da45cd8..f6416a2 100644
--- a/src/gui/smartdialog.h
+++ b/src/gui/smartdialog.h
@@ -16,9 +16,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(SMARTDIALOG__H)
+#if !defined(SMARTDIALOG_H)
-#define SMARTDIALOG__H
+#define SMARTDIALOG_H
#include
diff --git a/src/gui/smartdialogwidget.h b/src/gui/smartdialogwidget.h
index 4e6f094..3da6ec2 100644
--- a/src/gui/smartdialogwidget.h
+++ b/src/gui/smartdialogwidget.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(SMARTDIALOGWIDGET__H)
+#if !defined(SMARTDIALOGWIDGET_H)
-#define SMARTDIALOGWIDGET__H
+#define SMARTDIALOGWIDGET_H
#include "ui_smartdialogwidgetbase.h"
diff --git a/src/gui/treelog.h b/src/gui/treelog.h
index c30aa19..a60ac1a 100644
--- a/src/gui/treelog.h
+++ b/src/gui/treelog.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(TREELOG__H)
+#if !defined(TREELOG_H)
-#define TREELOG__H
+#define TREELOG_H
#include "ui_treelogbase.h"
diff --git a/src/gui/volumegroupdialog.h b/src/gui/volumegroupdialog.h
index 5fec912..b5ff3eb 100644
--- a/src/gui/volumegroupdialog.h
+++ b/src/gui/volumegroupdialog.h
@@ -16,9 +16,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(VOLUMEGROUPDIALOG__H)
+#if !defined(VOLUMEGROUPDIALOG_H)
-#define VOLUMEGROUPDIALOG__H
+#define VOLUMEGROUPDIALOG_H
#include
diff --git a/src/gui/volumegroupwidget.h b/src/gui/volumegroupwidget.h
index 8def0b8..7263d13 100644
--- a/src/gui/volumegroupwidget.h
+++ b/src/gui/volumegroupwidget.h
@@ -15,9 +15,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(VOLUMEGROUPWIDGET__H)
+#if !defined(VOLUMEGROUPWIDGET_H)
-#define VOLUMEGROUPWIDGET__H
+#define VOLUMEGROUPWIDGET_H
#include "ui_volumegroupwidgetbase.h"
diff --git a/src/util/guihelpers.h b/src/util/guihelpers.h
index cc2b7a6..462cea9 100644
--- a/src/util/guihelpers.h
+++ b/src/util/guihelpers.h
@@ -16,9 +16,9 @@
* along with this program. If not, see .*
*************************************************************************/
-#if !defined(GUIHELPERS__H)
+#if !defined(GUIHELPERS_H)
-#define GUIHELPERS__H
+#define GUIHELPERS_H
#include
#include