[glom/glom-1-14] Improve use of defines
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom/glom-1-14] Improve use of defines
- Date: Thu, 23 Sep 2010 14:12:10 +0000 (UTC)
commit e72d9b2e950e445cedbfd7d08f68ae45a50ad20c
Author: David King <davidk openismus com>
Date: Thu Sep 23 16:11:29 2010 +0200
Improve use of defines
* *.h: Be more consistent with include guards.
* glom/dialog_existing_or_new.cc:
* glom/libglom/connectionpool_backends/postrgres_self.cc:
* glom/libglom/document/document.cc: Convert defines to static const
data.
ChangeLog | 10 +
glom/application.h | 6 +-
glom/base_db_table.h | 6 +-
glom/base_db_table_data.h | 6 +-
glom/box_db_table.h | 6 +-
glom/box_reports.h | 7 +-
glom/dialog_existing_or_new.cc | 2 +-
glom/filechooser_export.h | 6 +-
glom/frame_glom.h | 6 +-
glom/import_csv/csv_parser.h | 8 +-
.../connectionpool_backends/postgres_self.cc | 14 +-
.../data_structure/layout/layoutitem_image.h | 4 +-
.../data_structure/layout/layoutitem_placeholder.h | 6 +-
.../data_structure/parameternamegenerator.h | 8 +-
glom/libglom/data_structure/relationship.h | 6 +-
glom/libglom/document/document.cc | 344 ++++++++++----------
glom/libglom/document/document.h | 6 +-
glom/libglom/document/view.h | 6 +-
glom/mode_data/box_data.h | 6 +-
glom/mode_data/box_data_calendar_related.h | 6 +-
glom/mode_data/box_data_details.h | 6 +-
glom/mode_data/box_data_list.h | 6 +-
glom/mode_data/box_data_list_related.h | 6 +-
glom/mode_data/box_data_manyrecords.h | 6 +-
glom/mode_data/box_data_portal.h | 6 +-
glom/mode_data/datawidget/checkbutton.h | 7 +-
glom/mode_data/datawidget/combo.h | 7 +-
.../datawidget/combochoiceswithtreemodel.h | 7 +-
glom/mode_data/datawidget/entry.h | 7 +-
glom/mode_data/flowtablewithfields.h | 6 +-
glom/mode_data/notebook_data.h | 6 +-
glom/mode_data/placeholder-glom.h | 9 +-
glom/mode_design/comboentry_currency.h | 7 +-
glom/mode_design/dialog_design.h | 6 +-
glom/mode_design/dialog_initial_password.h | 6 +-
glom/mode_design/fields/box_db_table_definition.h | 7 +-
glom/mode_design/fields/combo_fieldtype.h | 8 +-
glom/mode_design/fields/dialog_fieldcalculation.h | 6 +-
glom/mode_design/fields/dialog_fielddefinition.h | 6 +-
glom/mode_design/layout/combobox_fields.h | 7 +-
glom/mode_design/layout/combobox_relationship.h | 7 +-
glom/mode_design/layout/dialog_choose_field.h | 6 +-
.../layout/dialog_choose_relationship.h | 6 +-
glom/mode_design/layout/dialog_layout.h | 6 +-
.../layout/dialog_layout_calendar_related.h | 6 +-
glom/mode_design/layout/dialog_layout_details.h | 6 +-
glom/mode_design/layout/dialog_layout_export.h | 6 +-
glom/mode_design/layout/dialog_layout_list.h | 6 +-
.../layout/dialog_layout_list_related.h | 6 +-
.../layout/layout_item_dialogs/box_formatting.h | 6 +-
.../layout/layout_item_dialogs/combo_summarytype.h | 7 +-
.../layout_item_dialogs/comboentry_borderwidth.h | 7 +-
.../layout_item_dialogs/dialog_buttonscript.h | 6 +-
.../layout_item_dialogs/dialog_field_layout.h | 6 +-
.../layout/layout_item_dialogs/dialog_formatting.h | 6 +-
.../dialog_groupby_secondaryfields.h | 6 +-
.../dialog_groupby_sortfields.h | 6 +-
.../layout_item_dialogs/dialog_imageobject.h | 6 +-
.../layout/layout_item_dialogs/dialog_notebook.h | 6 +-
.../layout/layout_item_dialogs/dialog_textobject.h | 6 +-
glom/mode_design/layout/treestore_layout.h | 7 +-
.../print_layouts/print_layout_toolbar.h | 6 +-
.../report_layout/dialog_layout_report.h | 6 +-
glom/mode_design/translation/combobox_locale.h | 7 +-
glom/mode_find/box_data_details_find.h | 6 +-
glom/mode_find/box_data_list_find.h | 6 +-
glom/mode_find/notebook_find.h | 6 +-
glom/notebook_glom.h | 6 +-
glom/print_layout/canvas_print_layout.h | 7 +-
glom/report_builder.h | 6 +-
glom/signal_reemitter.h | 7 +-
glom/utility_widgets/adddel/adddel.h | 6 +-
glom/utility_widgets/adddel/adddel_withbuttons.h | 6 +-
glom/utility_widgets/adddel/treeviewcolumn_glom.h | 4 +-
.../cellrendererlist/cellrendererlist.h | 6 +-
glom/utility_widgets/combo_textglade.h | 7 +-
glom/utility_widgets/db_adddel/glom_db_treemodel.h | 6 +-
glom/utility_widgets/dialog_flowtable.h | 6 +-
glom/utility_widgets/dialog_image_progress.h | 7 +-
glom/utility_widgets/flowtable_dnd.h | 6 +-
glom/utility_widgets/layoutwidgetbase.h | 6 +-
glom/utility_widgets/layoutwidgetfield.h | 6 +-
glom/utility_widgets/layoutwidgetutils.h | 6 +-
glom/variablesmap.h | 8 +-
84 files changed, 430 insertions(+), 444 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f819e0e..8e007a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-23 David King <davidk openismus com>
+
+ Improve use of defines
+
+ * *.h: Be more consistent with include guards.
+ * glom/dialog_existing_or_new.cc:
+ * glom/libglom/connectionpool_backends/postrgres_self.cc:
+ * glom/libglom/document/document.cc: Convert defines to static const
+ data.
+
2010-09-10 David King <davidk openismus com>
Use GLOM_ABI_VERSION where possible
diff --git a/glom/application.h b/glom/application.h
index 706932d..fd7aa29 100644
--- a/glom/application.h
+++ b/glom/application.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef HEADER_APP_GLOM
-#define HEADER_APP_GLOM
+#ifndef GLOM_APPLICATION_H
+#define GLOM_APPLICATION_H
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
@@ -288,4 +288,4 @@ private:
} //namespace Glom
-#endif //HEADER_APP_GLOM
+#endif // GLOM_APPLICATION_H
diff --git a/glom/base_db_table.h b/glom/base_db_table.h
index 1050c95..faa9f6e 100644
--- a/glom/base_db_table.h
+++ b/glom/base_db_table.h
@@ -19,8 +19,8 @@
*/
-#ifndef BASE_DB_TABLE_H
-#define BASE_DB_TABLE_H
+#ifndef GLOM_BASE_DB_TABLE_H
+#define GLOM_BASE_DB_TABLE_H
#include <glom/base_db.h>
#include <libglom/data_structure/field.h>
@@ -48,4 +48,4 @@ protected:
} //namespace Glom
-#endif //BASE_DB_TABLE_H
+#endif // GLOM_BASE_DB_TABLE_H
diff --git a/glom/base_db_table_data.h b/glom/base_db_table_data.h
index ce6882a..00a63a3 100644
--- a/glom/base_db_table_data.h
+++ b/glom/base_db_table_data.h
@@ -19,8 +19,8 @@
*/
-#ifndef BASE_DB_TABLE_DATA_H
-#define BASE_DB_TABLE_DATA_H
+#ifndef GLOM_BASE_DB_TABLE_DATA_H
+#define GLOM_BASE_DB_TABLE_DATA_H
#include "base_db_table.h"
#include <libglom/data_structure/field.h>
@@ -100,4 +100,4 @@ private:
} //namespace Glom
-#endif //BASE_DB_TABLE__DATAH
+#endif // GLOM_BASE_DB_TABLE_DATA_H
diff --git a/glom/box_db_table.h b/glom/box_db_table.h
index d7002e2..9bc2031 100644
--- a/glom/box_db_table.h
+++ b/glom/box_db_table.h
@@ -19,8 +19,8 @@
*/
-#ifndef BOX_DB_TABLE_H
-#define BOX_DB_TABLE_H
+#ifndef GLOM_BOX_DB_TABLE_H
+#define GLOM_BOX_DB_TABLE_H
#include <glom/box_withbuttons.h>
#include <glom/base_db_table.h>
@@ -48,4 +48,4 @@ public:
} //namespace Glom
-#endif //BOX_DB_TABLE_H
+#endif // GLOM_BOX_DB_TABLE_H
diff --git a/glom/box_reports.h b/glom/box_reports.h
index 547de7d..96dc99f 100644
--- a/glom/box_reports.h
+++ b/glom/box_reports.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef BOX_REPORTS_H
-#define BOX_REPORTS_H
+#ifndef GLOM_BOX_REPORTS_H
+#define GLOM_BOX_REPORTS_H
#include "box_db_table.h"
#include <libglom/data_structure/report.h>
@@ -61,5 +61,4 @@ private:
} //namespace Glom
-#endif //BOX_REPORTS_H
-
+#endif // GLOM_BOX_REPORTS_H
diff --git a/glom/dialog_existing_or_new.cc b/glom/dialog_existing_or_new.cc
index ef5dd53..c422d79 100644
--- a/glom/dialog_existing_or_new.cc
+++ b/glom/dialog_existing_or_new.cc
@@ -43,7 +43,7 @@
#include <iostream>
#ifdef GLOM_ENABLE_CLIENT_ONLY
-#define NEW_PAGE 1
+static const int NEW_PAGE = 1;
#endif /* GLOM_ENABLE_CLIENT_ONLY */
namespace
diff --git a/glom/filechooser_export.h b/glom/filechooser_export.h
index 018c6d2..17deef3 100644
--- a/glom/filechooser_export.h
+++ b/glom/filechooser_export.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef FILECHOOSER_EXPORT_GLOM_H
-#define FILECHOOSER_EXPORT_GLOM_H
+#ifndef GLOM_FILECHOOSER_EXPORT_H
+#define GLOM_FILECHOOSER_EXPORT_H
#include <libglom/document/document.h>
#include <gtkmm/filechooserdialog.h>
@@ -63,4 +63,4 @@ private:
} //namespace Glom
-#endif
+#endif // GLOM_FILESCHOOSER_EXPORT_H
diff --git a/glom/frame_glom.h b/glom/frame_glom.h
index 65d965e..44c817a 100644
--- a/glom/frame_glom.h
+++ b/glom/frame_glom.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef FRAME_GLOM_H
-#define FRAME_GLOM_H
+#ifndef GLOM_FRAME_GLOM_H
+#define GLOM_FRAME_GLOM_H
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
@@ -314,4 +314,4 @@ private:
} //namespace Glom
-#endif //FRAME_GLOM_H
+#endif // GLOM_FRAME_GLOM_H
diff --git a/glom/import_csv/csv_parser.h b/glom/import_csv/csv_parser.h
index d99c4cb..6d206d6 100644
--- a/glom/import_csv/csv_parser.h
+++ b/glom/import_csv/csv_parser.h
@@ -19,8 +19,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_IMPORT_CSV_H
-#define GLOM_IMPORT_CSV_H
+#ifndef GLOM_CSV_PARSER_H
+#define GLOM_CSV_PARSER_H
#include "base_db.h"
@@ -209,6 +209,4 @@ private:
} //namespace Glom
-#endif //GLOM_IMPORT_CSV_H
-
-
+#endif //GLOM_CSV_PARSER_H
diff --git a/glom/libglom/connectionpool_backends/postgres_self.cc b/glom/libglom/connectionpool_backends/postgres_self.cc
index 35674ed..8747445 100644
--- a/glom/libglom/connectionpool_backends/postgres_self.cc
+++ b/glom/libglom/connectionpool_backends/postgres_self.cc
@@ -90,10 +90,6 @@ namespace ConnectionPoolBackends
"# IPv6 local connections:\n" \
"host all all ::1/128 md5\n"
-#define PORT_POSTGRESQL_SELF_HOSTED_START 5433
-#define PORT_POSTGRESQL_SELF_HOSTED_END 5500
-
-
#define DEFAULT_CONFIG_PG_HBA_REMOTE_8p3 \
DEFAULT_CONFIG_PG_HBA_LOCAL_8p3 \
DEFAULT_CONFIG_PG_HBA_REMOTE_EXTRA
@@ -102,12 +98,12 @@ DEFAULT_CONFIG_PG_HBA_REMOTE_EXTRA
DEFAULT_CONFIG_PG_HBA_LOCAL_8p3 \
DEFAULT_CONFIG_PG_HBA_REMOTE_EXTRA
-#define PORT_POSTGRESQL_SELF_HOSTED_START 5433
-#define PORT_POSTGRESQL_SELF_HOSTED_END 5500
+static const int PORT_POSTGRESQL_SELF_HOSTED_START = 5433;
+static const int PORT_POSTGRESQL_SELF_HOSTED_END = 5500;
-static const char* DEFAULT_CONFIG_PG_IDENT = "";
-static const char* FILENAME_DATA = "data";
-static const char* FILENAME_BACKUP = "backup";
+static const char DEFAULT_CONFIG_PG_IDENT[] = "";
+static const char FILENAME_DATA[] = "data";
+static const char FILENAME_BACKUP[] = "backup";
PostgresSelfHosted::PostgresSelfHosted()
: m_network_shared(false)
diff --git a/glom/libglom/data_structure/layout/layoutitem_image.h b/glom/libglom/data_structure/layout/layoutitem_image.h
index 6f8cafe..0c92e9d 100644
--- a/glom/libglom/data_structure/layout/layoutitem_image.h
+++ b/glom/libglom/data_structure/layout/layoutitem_image.h
@@ -30,8 +30,8 @@ namespace Glom
//JPEG seems to give ugly results when saved to the database and shown again.
//#define GLOM_IMAGE_FORMAT "jpeg"
//#define GLOM_IMAGE_FORMAT_MIME_TYPE "image/jpeg"
- #define GLOM_IMAGE_FORMAT "png"
- #define GLOM_IMAGE_FORMAT_MIME_TYPE "image/png"
+ const char GLOM_IMAGE_FORMAT[] = "png";
+ const char GLOM_IMAGE_FORMAT_MIME_TYPE[] = "image/png";
class LayoutItem_Image
: public LayoutItem
diff --git a/glom/libglom/data_structure/layout/layoutitem_placeholder.h b/glom/libglom/data_structure/layout/layoutitem_placeholder.h
index 42ec798..db79444 100644
--- a/glom/libglom/data_structure/layout/layoutitem_placeholder.h
+++ b/glom/libglom/data_structure/layout/layoutitem_placeholder.h
@@ -22,8 +22,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _LAYOUTITEM_PLACEHOLDER_H_
-#define _LAYOUTITEM_PLACEHOLDER_H_
+#ifndef GLOM_LAYOUTITEM_PLACEHOLDER_H
+#define GLOM_LAYOUTITEM_PLACEHOLDER_H
#include <libglom/data_structure/layout/layoutitem.h>
@@ -51,4 +51,4 @@ public:
}
-#endif // _LAYOUTITEM_PLACEHOLDER_H_
+#endif // GLOM_LAYOUTITEM_PLACEHOLDER_H
diff --git a/glom/libglom/data_structure/parameternamegenerator.h b/glom/libglom/data_structure/parameternamegenerator.h
index e1318f8..47fc7b2 100644
--- a/glom/libglom/data_structure/parameternamegenerator.h
+++ b/glom/libglom/data_structure/parameternamegenerator.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _PARAMETERNAMEGENERATOR_H_
-#define _PARAMETERNAMEGENERATOR_H_
+#ifndef GLOM_DATA_STRUCTURE_PARAMETERNAMEGENERATOR_H
+#define GLOM_DATA_STRUCTURE_PARAMETERNAMEGENERATOR_H
#include <map>
#include <glibmm/ustring.h>
@@ -39,6 +39,6 @@ private:
unsigned int m_id;
};
-#endif // _PARAMETERNAMEGENERATOR_H_
-
}
+
+#endif // GLOM_DATA_STRUCTURE_PARAMETERNAMEGENERATOR_H
diff --git a/glom/libglom/data_structure/relationship.h b/glom/libglom/data_structure/relationship.h
index 693c9b1..1d8109d 100644
--- a/glom/libglom/data_structure/relationship.h
+++ b/glom/libglom/data_structure/relationship.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef RELATIONSHIP_H
-#define RELATIONSHIP_H
+#ifndef GLOM_RELATIONSHIP_H
+#define GLOM_RELATIONSHIP_H
#include <libglom/data_structure/translatable_item.h>
#include <libglom/data_structure/has_title_singular.h>
@@ -80,4 +80,4 @@ private:
} //namespace Glom
-#endif
+#endif // GLOM_RELATIONSHIP_H
diff --git a/glom/libglom/document/document.cc b/glom/libglom/document/document.cc
index 116ec47..e5317d2 100644
--- a/glom/libglom/document/document.cc
+++ b/glom/libglom/document/document.cc
@@ -45,180 +45,180 @@
namespace Glom
{
-#define GLOM_NODE_CONNECTION "connection"
-#define GLOM_ATTRIBUTE_CONNECTION_SELF_HOSTED "self_hosted" //deprecated.
-#define GLOM_ATTRIBUTE_CONNECTION_HOSTING_MODE "hosting_mode"
-#define GLOM_ATTRIBUTE_CONNECTION_HOSTING_POSTGRES_CENTRAL "postgres_central"
-#define GLOM_ATTRIBUTE_CONNECTION_HOSTING_POSTGRES_SELF "postgres_self"
-#define GLOM_ATTRIBUTE_CONNECTION_HOSTING_SQLITE "sqlite"
-#define GLOM_ATTRIBUTE_CONNECTION_NETWORK_SHARED "network_shared"
-#define GLOM_ATTRIBUTE_CONNECTION_SERVER "server"
-#define GLOM_ATTRIBUTE_CONNECTION_PORT "port"
-#define GLOM_ATTRIBUTE_CONNECTION_TRY_OTHER_PORTS "try_other_ports"
-#define GLOM_ATTRIBUTE_CONNECTION_USER "user"
-#define GLOM_ATTRIBUTE_CONNECTION_DATABASE "database"
-
-#define GLOM_NODE_DATA_LAYOUT_GROUPS "data_layout_groups"
-#define GLOM_NODE_DATA_LAYOUT_GROUP "data_layout_group"
-#define GLOM_ATTRIBUTE_COLUMNS_COUNT "columns_count"
-#define GLOM_ATTRIBUTE_BORDER_WIDTH "border_width"
-
-#define GLOM_NODE_DATA_LAYOUTS "data_layouts"
-#define GLOM_NODE_DATA_LAYOUT "data_layout"
-#define GLOM_ATTRIBUTE_LAYOUT_PLATFORM "platform"
-#define GLOM_ATTRIBUTE_PARENT_TABLE_NAME "parent_table"
-
-#define GLOM_NODE_DATA_LAYOUT_NOTEBOOK "data_layout_notebook"
-
-#define GLOM_NODE_DATA_LAYOUT_PORTAL "data_layout_portal"
-#define GLOM_NODE_DATA_LAYOUT_PORTAL_NAVIGATIONRELATIONSHIP "portal_navigation_relationship"
-#define GLOM_ATTRIBUTE_PORTAL_NAVIGATION_TYPE "navigation_type"
-#define GLOM_ATTRIBUTE_PORTAL_NAVIGATION_TYPE_AUTOMATIC "automatic"
-#define GLOM_ATTRIBUTE_PORTAL_NAVIGATION_TYPE_SPECIFIC "specific"
-#define GLOM_ATTRIBUTE_PORTAL_NAVIGATION_TYPE_NONE "none"
-
-#define GLOM_NODE_DATA_LAYOUT_CALENDAR_PORTAL "data_layout_calendar_portal"
-#define GLOM_ATTRIBUTE_PORTAL_PRINT_LAYOUT_ROW_HEIGHT "row_height"
-#define GLOM_ATTRIBUTE_PORTAL_CALENDAR_DATE_FIELD "date_field"
-#define GLOM_NODE_DATA_LAYOUT_ITEM "data_layout_item" //A field.
-#define GLOM_NODE_LAYOUT_ITEM_CUSTOM_TITLE "title_custom"
-#define GLOM_NODE_TABLE_TITLE_SINGULAR "title_singular" //such as "Customer" instead of "Customers".
-#define GLOM_ATTRIBUTE_LAYOUT_ITEM_CUSTOM_TITLE_USE "use_custom"
-#define GLOM_ATTRIBUTE_LAYOUT_ITEM_COLUMN_WIDTH "column_width"
-#define GLOM_NODE_DATA_LAYOUT_BUTTON "data_layout_button"
-#define GLOM_NODE_DATA_LAYOUT_TEXTOBJECT "data_layout_text"
-#define GLOM_NODE_DATA_LAYOUT_TEXTOBJECT_TEXT "text"
-#define GLOM_NODE_DATA_LAYOUT_IMAGEOBJECT "data_layout_image"
-#define GLOM_ATTRIBUTE_DATA_LAYOUT_IMAGEOBJECT_IMAGE "text"
-#define GLOM_NODE_DATA_LAYOUT_LINE "data_layout_line"
-#define GLOM_ATTRIBUTE_DATA_LAYOUT_LINE_START_X "start_x"
-#define GLOM_ATTRIBUTE_DATA_LAYOUT_LINE_START_Y "start_y"
-#define GLOM_ATTRIBUTE_DATA_LAYOUT_LINE_END_X "end_x"
-#define GLOM_ATTRIBUTE_DATA_LAYOUT_LINE_END_Y "end_y"
-#define GLOM_ATTRIBUTE_DATA_LAYOUT_ITEM_FIELD_USE_DEFAULT_FORMATTING "use_default_formatting"
-#define GLOM_NODE_DATA_LAYOUT_ITEM_GROUPBY "data_layout_item_groupby"
-#define GLOM_NODE_DATA_LAYOUT_GROUP_SECONDARYFIELDS "secondary_fields"
-#define GLOM_NODE_DATA_LAYOUT_ITEM_VERTICALGROUP "data_layout_item_verticalgroup"
-#define GLOM_NODE_DATA_LAYOUT_ITEM_SUMMARY "data_layout_item_summary"
-#define GLOM_NODE_DATA_LAYOUT_ITEM_FIELDSUMMARY "data_layout_item_fieldsummary"
-#define GLOM_NODE_DATA_LAYOUT_ITEM_HEADER "data_layout_item_header"
-#define GLOM_NODE_DATA_LAYOUT_ITEM_FOOTER "data_layout_item_footer"
-#define GLOM_NODE_TABLE "table"
-#define GLOM_NODE_FIELDS "fields"
-#define GLOM_NODE_FIELD "field"
-#define GLOM_ATTRIBUTE_PRIMARY_KEY "primary_key"
-#define GLOM_ATTRIBUTE_DEFAULT_VALUE "default_value"
-#define GLOM_ATTRIBUTE_UNIQUE "unique"
-#define GLOM_ATTRIBUTE_AUTOINCREMENT "auto_increment"
-#define GLOM_DEPRECATED_ATTRIBUTE_CALCULATION "calculation"
-#define GLOM_NODE_CALCULATION "calculation"
-#define GLOM_ATTRIBUTE_TYPE "type"
-
-#define GLOM_NODE_FIELD_LOOKUP "field_lookup"
-#define GLOM_NODE_RELATIONSHIPS "relationships"
-#define GLOM_NODE_RELATIONSHIP "relationship"
-#define GLOM_ATTRIBUTE_KEY "key"
-#define GLOM_ATTRIBUTE_OTHER_TABLE "other_table"
-#define GLOM_ATTRIBUTE_OTHER_KEY "other_key"
-#define GLOM_ATTRIBUTE_AUTO_CREATE "auto_create"
-#define GLOM_ATTRIBUTE_ALLOW_EDIT "allow_edit"
-
-#define GLOM_NODE_GROUPS "groups"
-#define GLOM_NODE_GROUP "group"
-#define GLOM_ATTRIBUTE_DEVELOPER "developer"
-#define GLOM_NODE_TABLE_PRIVS "table_privs"
-#define GLOM_ATTRIBUTE_TABLE_NAME "table_name"
-#define GLOM_ATTRIBUTE_PRIV_VIEW "priv_view"
-#define GLOM_ATTRIBUTE_PRIV_EDIT "priv_edit"
-#define GLOM_ATTRIBUTE_PRIV_CREATE "priv_create"
-#define GLOM_ATTRIBUTE_PRIV_DELETE "priv_delete"
-
-#define GLOM_ATTRIBUTE_FORMAT_VERSION "format_version"
-#define GLOM_ATTRIBUTE_IS_EXAMPLE "is_example"
-#define GLOM_ATTRIBUTE_IS_BACKUP "is_backup"
-#define GLOM_ATTRIBUTE_CONNECTION_DATABASE_TITLE "database_title"
-#define GLOM_NODE_STARTUP_SCRIPT "startup_script"
-#define GLOM_ATTRIBUTE_TRANSLATION_ORIGINAL_LOCALE "translation_original_locale"
-#define GLOM_ATTRIBUTE_NAME "name"
-#define GLOM_ATTRIBUTE_TITLE "title"
-#define GLOM_ATTRIBUTE_HIDDEN "hidden"
-#define GLOM_ATTRIBUTE_DEFAULT "default"
-#define GLOM_ATTRIBUTE_OVERVIEW_X "overview_x"
-#define GLOM_ATTRIBUTE_OVERVIEW_Y "overview_y"
-#define GLOM_ATTRIBUTE_FIELD "field"
-#define GLOM_ATTRIBUTE_EDITABLE "editable"
-#define GLOM_NODE_EXAMPLE_ROWS "example_rows"
-#define GLOM_NODE_EXAMPLE_ROW "example_row"
-#define GLOM_NODE_VALUE "value"
-#define GLOM_ATTRIBUTE_COLUMN "column"
-#define GLOM_DEPRECATED_ATTRIBUTE_BUTTON_SCRIPT "script"
-#define GLOM_NODE_BUTTON_SCRIPT "script"
-#define GLOM_ATTRIBUTE_SORT_ASCENDING "sort_ascending"
-
-
-
-#define GLOM_ATTRIBUTE_RELATIONSHIP_NAME "relationship"
-#define GLOM_ATTRIBUTE_RELATED_RELATIONSHIP_NAME "related_relationship"
-
-#define GLOM_NODE_REPORTS "reports"
-#define GLOM_NODE_REPORT "report"
-#define GLOM_ATTRIBUTE_REPORT_SHOW_TABLE_TITLE "show_table_title"
-#define GLOM_NODE_REPORT_ITEM_GROUPBY_GROUPBY "groupby"
-#define GLOM_NODE_REPORT_ITEM_GROUPBY_SORTBY "sortby"
-#define GLOM_ATTRIBUTE_LAYOUT_ITEM_FIELDSUMMARY_SUMMARYTYPE "summarytype"
-
-#define GLOM_NODE_PRINT_LAYOUTS "print_layouts"
-#define GLOM_NODE_PRINT_LAYOUT "print_layout"
-
-#define GLOM_NODE_FORMAT "formatting"
-#define GLOM_ATTRIBUTE_FORMAT_THOUSANDS_SEPARATOR "format_thousands_separator"
-#define GLOM_ATTRIBUTE_FORMAT_DECIMAL_PLACES_RESTRICTED "format_decimal_places_restricted"
-#define GLOM_ATTRIBUTE_FORMAT_DECIMAL_PLACES "format_decimal_places"
-#define GLOM_ATTRIBUTE_FORMAT_CURRENCY_SYMBOL "format_currency_symbol"
-#define GLOM_ATTRIBUTE_FORMAT_USE_ALT_NEGATIVE_COLOR "format_use_alt_negative_color" //Just a bool, not a color.
-
-#define GLOM_ATTRIBUTE_FORMAT_TEXT_MULTILINE "format_text_multiline"
-#define GLOM_ATTRIBUTE_FORMAT_TEXT_MULTILINE_HEIGHT_LINES "format_text_multiline_height_lines"
-#define GLOM_ATTRIBUTE_FORMAT_TEXT_FONT "font"
-#define GLOM_ATTRIBUTE_FORMAT_TEXT_COLOR_FOREGROUND "color_fg"
-#define GLOM_ATTRIBUTE_FORMAT_TEXT_COLOR_BACKGROUND "color_bg"
-
-#define GLOM_ATTRIBUTE_FORMAT_HORIZONTAL_ALIGNMENT "alignment_horizontal"
-#define GLOM_ATTRIBUTE_FORMAT_HORIZONTAL_ALIGNMENT_AUTO "auto"
-#define GLOM_ATTRIBUTE_FORMAT_HORIZONTAL_ALIGNMENT_LEFT "left"
-#define GLOM_ATTRIBUTE_FORMAT_HORIZONTAL_ALIGNMENT_RIGHT "right"
-
-#define GLOM_ATTRIBUTE_FORMAT_CHOICES_RESTRICTED "choices_restricted"
-#define GLOM_ATTRIBUTE_FORMAT_CHOICES_RESTRICTED_AS_RADIO_BUTTONS "choices_restricted_radiobuttons"
-#define GLOM_ATTRIBUTE_FORMAT_CHOICES_CUSTOM "choices_custom"
-#define GLOM_ATTRIBUTE_FORMAT_CHOICES_CUSTOM_LIST "custom_choice_list"
-#define GLOM_NODE_FORMAT_CUSTOM_CHOICE "custom_choice"
-#define GLOM_ATTRIBUTE_VALUE "value"
-#define GLOM_ATTRIBUTE_FORMAT_CHOICES_RELATED "choices_related"
-#define GLOM_ATTRIBUTE_FORMAT_CHOICES_RELATED_RELATIONSHIP "choices_related_relationship"
-#define GLOM_ATTRIBUTE_FORMAT_CHOICES_RELATED_FIELD "choices_related_field"
-#define GLOM_ATTRIBUTE_FORMAT_CHOICES_RELATED_SECOND "choices_related_second"
-
-#define GLOM_NODE_TRANSLATIONS_SET "trans_set"
-#define GLOM_NODE_TRANSLATION "trans"
-#define GLOM_ATTRIBUTE_TRANSLATION_LOCALE "loc"
-#define GLOM_ATTRIBUTE_TRANSLATION_VALUE "val"
-
-#define GLOM_NODE_POSITION "position"
-#define GLOM_ATTRIBUTE_POSITION_X "x"
-#define GLOM_ATTRIBUTE_POSITION_Y "y"
-#define GLOM_ATTRIBUTE_POSITION_WIDTH "width"
-#define GLOM_ATTRIBUTE_POSITION_HEIGHT "height"
-
-#define GLOM_NODE_PAGE_SETUP "page_setup" //Its text child is the keyfile for a GtkPageSetup
-
-#define GLOM_NODE_LIBRARY_MODULES "library_modules"
-#define GLOM_NODE_LIBRARY_MODULE "module"
-#define GLOM_ATTRIBUTE_LIBRARY_MODULE_NAME "name"
-#define GLOM_ATTRIBUTE_LIBRARY_MODULE_SCRIPT "script" //deprecated
+static const char GLOM_NODE_CONNECTION[] = "connection";
+static const char GLOM_ATTRIBUTE_CONNECTION_SELF_HOSTED[] = "self_hosted"; //deprecated.
+static const char GLOM_ATTRIBUTE_CONNECTION_HOSTING_MODE[] = "hosting_mode";
+static const char GLOM_ATTRIBUTE_CONNECTION_HOSTING_POSTGRES_CENTRAL[] = "postgres_central";
+static const char GLOM_ATTRIBUTE_CONNECTION_HOSTING_POSTGRES_SELF[] = "postgres_self";
+static const char GLOM_ATTRIBUTE_CONNECTION_HOSTING_SQLITE[] = "sqlite";
+static const char GLOM_ATTRIBUTE_CONNECTION_NETWORK_SHARED[] = "network_shared";
+static const char GLOM_ATTRIBUTE_CONNECTION_SERVER[] = "server";
+static const char GLOM_ATTRIBUTE_CONNECTION_PORT[] = "port";
+static const char GLOM_ATTRIBUTE_CONNECTION_TRY_OTHER_PORTS[] = "try_other_ports";
+static const char GLOM_ATTRIBUTE_CONNECTION_USER[] = "user";
+static const char GLOM_ATTRIBUTE_CONNECTION_DATABASE[] = "database";
+
+static const char GLOM_NODE_DATA_LAYOUT_GROUPS[] = "data_layout_groups";
+static const char GLOM_NODE_DATA_LAYOUT_GROUP[] = "data_layout_group";
+static const char GLOM_ATTRIBUTE_COLUMNS_COUNT[] = "columns_count";
+static const char GLOM_ATTRIBUTE_BORDER_WIDTH[] = "border_width";
+
+static const char GLOM_NODE_DATA_LAYOUTS[] = "data_layouts";
+static const char GLOM_NODE_DATA_LAYOUT[] = "data_layout";
+static const char GLOM_ATTRIBUTE_LAYOUT_PLATFORM[] = "platform";
+static const char GLOM_ATTRIBUTE_PARENT_TABLE_NAME[] = "parent_table";
+
+static const char GLOM_NODE_DATA_LAYOUT_NOTEBOOK[] = "data_layout_notebook";
+
+static const char GLOM_NODE_DATA_LAYOUT_PORTAL[] = "data_layout_portal";
+static const char GLOM_NODE_DATA_LAYOUT_PORTAL_NAVIGATIONRELATIONSHIP[] = "portal_navigation_relationship";
+static const char GLOM_ATTRIBUTE_PORTAL_NAVIGATION_TYPE[] = "navigation_type";
+static const char GLOM_ATTRIBUTE_PORTAL_NAVIGATION_TYPE_AUTOMATIC[] = "automatic";
+static const char GLOM_ATTRIBUTE_PORTAL_NAVIGATION_TYPE_SPECIFIC[] = "specific";
+static const char GLOM_ATTRIBUTE_PORTAL_NAVIGATION_TYPE_NONE[] = "none";
+
+static const char GLOM_NODE_DATA_LAYOUT_CALENDAR_PORTAL[] = "data_layout_calendar_portal";
+static const char GLOM_ATTRIBUTE_PORTAL_PRINT_LAYOUT_ROW_HEIGHT[] = "row_height";
+static const char GLOM_ATTRIBUTE_PORTAL_CALENDAR_DATE_FIELD[] = "date_field";
+static const char GLOM_NODE_DATA_LAYOUT_ITEM[] = "data_layout_item"; //A field.
+static const char GLOM_NODE_LAYOUT_ITEM_CUSTOM_TITLE[] = "title_custom";
+static const char GLOM_NODE_TABLE_TITLE_SINGULAR[] = "title_singular"; //such as "Customer" instead of "Customers".
+static const char GLOM_ATTRIBUTE_LAYOUT_ITEM_CUSTOM_TITLE_USE[] = "use_custom";
+static const char GLOM_ATTRIBUTE_LAYOUT_ITEM_COLUMN_WIDTH[] = "column_width";
+static const char GLOM_NODE_DATA_LAYOUT_BUTTON[] = "data_layout_button";
+static const char GLOM_NODE_DATA_LAYOUT_TEXTOBJECT[] = "data_layout_text";
+static const char GLOM_NODE_DATA_LAYOUT_TEXTOBJECT_TEXT[] = "text";
+static const char GLOM_NODE_DATA_LAYOUT_IMAGEOBJECT[] = "data_layout_image";
+static const char GLOM_ATTRIBUTE_DATA_LAYOUT_IMAGEOBJECT_IMAGE[] = "text";
+static const char GLOM_NODE_DATA_LAYOUT_LINE[] = "data_layout_line";
+static const char GLOM_ATTRIBUTE_DATA_LAYOUT_LINE_START_X[] = "start_x";
+static const char GLOM_ATTRIBUTE_DATA_LAYOUT_LINE_START_Y[] = "start_y";
+static const char GLOM_ATTRIBUTE_DATA_LAYOUT_LINE_END_X[] = "end_x";
+static const char GLOM_ATTRIBUTE_DATA_LAYOUT_LINE_END_Y[] = "end_y";
+static const char GLOM_ATTRIBUTE_DATA_LAYOUT_ITEM_FIELD_USE_DEFAULT_FORMATTING[] = "use_default_formatting";
+static const char GLOM_NODE_DATA_LAYOUT_ITEM_GROUPBY[] = "data_layout_item_groupby";
+static const char GLOM_NODE_DATA_LAYOUT_GROUP_SECONDARYFIELDS[] = "secondary_fields";
+static const char GLOM_NODE_DATA_LAYOUT_ITEM_VERTICALGROUP[] = "data_layout_item_verticalgroup";
+static const char GLOM_NODE_DATA_LAYOUT_ITEM_SUMMARY[] = "data_layout_item_summary";
+static const char GLOM_NODE_DATA_LAYOUT_ITEM_FIELDSUMMARY[] = "data_layout_item_fieldsummary";
+static const char GLOM_NODE_DATA_LAYOUT_ITEM_HEADER[] = "data_layout_item_header";
+static const char GLOM_NODE_DATA_LAYOUT_ITEM_FOOTER[] = "data_layout_item_footer";
+static const char GLOM_NODE_TABLE[] = "table";
+static const char GLOM_NODE_FIELDS[] = "fields";
+static const char GLOM_NODE_FIELD[] = "field";
+static const char GLOM_ATTRIBUTE_PRIMARY_KEY[] = "primary_key";
+static const char GLOM_ATTRIBUTE_DEFAULT_VALUE[] = "default_value";
+static const char GLOM_ATTRIBUTE_UNIQUE[] = "unique";
+static const char GLOM_ATTRIBUTE_AUTOINCREMENT[] = "auto_increment";
+static const char GLOM_DEPRECATED_ATTRIBUTE_CALCULATION[] = "calculation";
+static const char GLOM_NODE_CALCULATION[] = "calculation";
+static const char GLOM_ATTRIBUTE_TYPE[] = "type";
+
+static const char GLOM_NODE_FIELD_LOOKUP[] = "field_lookup";
+static const char GLOM_NODE_RELATIONSHIPS[] = "relationships";
+static const char GLOM_NODE_RELATIONSHIP[] = "relationship";
+static const char GLOM_ATTRIBUTE_KEY[] = "key";
+static const char GLOM_ATTRIBUTE_OTHER_TABLE[] = "other_table";
+static const char GLOM_ATTRIBUTE_OTHER_KEY[] = "other_key";
+static const char GLOM_ATTRIBUTE_AUTO_CREATE[] = "auto_create";
+static const char GLOM_ATTRIBUTE_ALLOW_EDIT[] = "allow_edit";
+
+static const char GLOM_NODE_GROUPS[] = "groups";
+static const char GLOM_NODE_GROUP[] = "group";
+static const char GLOM_ATTRIBUTE_DEVELOPER[] = "developer";
+static const char GLOM_NODE_TABLE_PRIVS[] = "table_privs";
+static const char GLOM_ATTRIBUTE_TABLE_NAME[] = "table_name";
+static const char GLOM_ATTRIBUTE_PRIV_VIEW[] = "priv_view";
+static const char GLOM_ATTRIBUTE_PRIV_EDIT[] = "priv_edit";
+static const char GLOM_ATTRIBUTE_PRIV_CREATE[] = "priv_create";
+static const char GLOM_ATTRIBUTE_PRIV_DELETE[] = "priv_delete";
+
+static const char GLOM_ATTRIBUTE_FORMAT_VERSION[] = "format_version";
+static const char GLOM_ATTRIBUTE_IS_EXAMPLE[] = "is_example";
+static const char GLOM_ATTRIBUTE_IS_BACKUP[] = "is_backup";
+static const char GLOM_ATTRIBUTE_CONNECTION_DATABASE_TITLE[] = "database_title";
+static const char GLOM_NODE_STARTUP_SCRIPT[] = "startup_script";
+static const char GLOM_ATTRIBUTE_TRANSLATION_ORIGINAL_LOCALE[] = "translation_original_locale";
+static const char GLOM_ATTRIBUTE_NAME[] = "name";
+static const char GLOM_ATTRIBUTE_TITLE[] = "title";
+static const char GLOM_ATTRIBUTE_HIDDEN[] = "hidden";
+static const char GLOM_ATTRIBUTE_DEFAULT[] = "default";
+static const char GLOM_ATTRIBUTE_OVERVIEW_X[] = "overview_x";
+static const char GLOM_ATTRIBUTE_OVERVIEW_Y[] = "overview_y";
+static const char GLOM_ATTRIBUTE_FIELD[] = "field";
+static const char GLOM_ATTRIBUTE_EDITABLE[] = "editable";
+static const char GLOM_NODE_EXAMPLE_ROWS[] = "example_rows";
+static const char GLOM_NODE_EXAMPLE_ROW[] = "example_row";
+static const char GLOM_NODE_VALUE[] = "value";
+static const char GLOM_ATTRIBUTE_COLUMN[] = "column";
+static const char GLOM_DEPRECATED_ATTRIBUTE_BUTTON_SCRIPT[] = "script";
+static const char GLOM_NODE_BUTTON_SCRIPT[] = "script";
+static const char GLOM_ATTRIBUTE_SORT_ASCENDING[] = "sort_ascending";
+
+
+
+static const char GLOM_ATTRIBUTE_RELATIONSHIP_NAME[] = "relationship";
+static const char GLOM_ATTRIBUTE_RELATED_RELATIONSHIP_NAME[] = "related_relationship";
+
+static const char GLOM_NODE_REPORTS[] = "reports";
+static const char GLOM_NODE_REPORT[] = "report";
+static const char GLOM_ATTRIBUTE_REPORT_SHOW_TABLE_TITLE[] = "show_table_title";
+static const char GLOM_NODE_REPORT_ITEM_GROUPBY_GROUPBY[] = "groupby";
+static const char GLOM_NODE_REPORT_ITEM_GROUPBY_SORTBY[] = "sortby";
+static const char GLOM_ATTRIBUTE_LAYOUT_ITEM_FIELDSUMMARY_SUMMARYTYPE[] = "summarytype";
+
+static const char GLOM_NODE_PRINT_LAYOUTS[] = "print_layouts";
+static const char GLOM_NODE_PRINT_LAYOUT[] = "print_layout";
+
+static const char GLOM_NODE_FORMAT[] = "formatting";
+static const char GLOM_ATTRIBUTE_FORMAT_THOUSANDS_SEPARATOR[] = "format_thousands_separator";
+static const char GLOM_ATTRIBUTE_FORMAT_DECIMAL_PLACES_RESTRICTED[] = "format_decimal_places_restricted";
+static const char GLOM_ATTRIBUTE_FORMAT_DECIMAL_PLACES[] = "format_decimal_places";
+static const char GLOM_ATTRIBUTE_FORMAT_CURRENCY_SYMBOL[] = "format_currency_symbol";
+static const char GLOM_ATTRIBUTE_FORMAT_USE_ALT_NEGATIVE_COLOR[] = "format_use_alt_negative_color"; //Just a bool, not a color.
+
+static const char GLOM_ATTRIBUTE_FORMAT_TEXT_MULTILINE[] = "format_text_multiline";
+static const char GLOM_ATTRIBUTE_FORMAT_TEXT_MULTILINE_HEIGHT_LINES[] = "format_text_multiline_height_lines";
+static const char GLOM_ATTRIBUTE_FORMAT_TEXT_FONT[] = "font";
+static const char GLOM_ATTRIBUTE_FORMAT_TEXT_COLOR_FOREGROUND[] = "color_fg";
+static const char GLOM_ATTRIBUTE_FORMAT_TEXT_COLOR_BACKGROUND[] = "color_bg";
+
+static const char GLOM_ATTRIBUTE_FORMAT_HORIZONTAL_ALIGNMENT[] = "alignment_horizontal";
+static const char GLOM_ATTRIBUTE_FORMAT_HORIZONTAL_ALIGNMENT_AUTO[] = "auto";
+static const char GLOM_ATTRIBUTE_FORMAT_HORIZONTAL_ALIGNMENT_LEFT[] = "left";
+static const char GLOM_ATTRIBUTE_FORMAT_HORIZONTAL_ALIGNMENT_RIGHT[] = "right";
+
+static const char GLOM_ATTRIBUTE_FORMAT_CHOICES_RESTRICTED[] = "choices_restricted";
+static const char GLOM_ATTRIBUTE_FORMAT_CHOICES_RESTRICTED_AS_RADIO_BUTTONS[] = "choices_restricted_radiobuttons";
+static const char GLOM_ATTRIBUTE_FORMAT_CHOICES_CUSTOM[] = "choices_custom";
+static const char GLOM_ATTRIBUTE_FORMAT_CHOICES_CUSTOM_LIST[] = "custom_choice_list";
+static const char GLOM_NODE_FORMAT_CUSTOM_CHOICE[] = "custom_choice";
+static const char GLOM_ATTRIBUTE_VALUE[] = "value";
+static const char GLOM_ATTRIBUTE_FORMAT_CHOICES_RELATED[] = "choices_related";
+static const char GLOM_ATTRIBUTE_FORMAT_CHOICES_RELATED_RELATIONSHIP[] = "choices_related_relationship";
+static const char GLOM_ATTRIBUTE_FORMAT_CHOICES_RELATED_FIELD[] = "choices_related_field";
+static const char GLOM_ATTRIBUTE_FORMAT_CHOICES_RELATED_SECOND[] = "choices_related_second";
+
+static const char GLOM_NODE_TRANSLATIONS_SET[] = "trans_set";
+static const char GLOM_NODE_TRANSLATION[] = "trans";
+static const char GLOM_ATTRIBUTE_TRANSLATION_LOCALE[] = "loc";
+static const char GLOM_ATTRIBUTE_TRANSLATION_VALUE[] = "val";
+
+static const char GLOM_NODE_POSITION[] = "position";
+static const char GLOM_ATTRIBUTE_POSITION_X[] = "x";
+static const char GLOM_ATTRIBUTE_POSITION_Y[] = "y";
+static const char GLOM_ATTRIBUTE_POSITION_WIDTH[] = "width";
+static const char GLOM_ATTRIBUTE_POSITION_HEIGHT[] = "height";
+
+static const char GLOM_NODE_PAGE_SETUP[] = "page_setup"; //Its text child is the keyfile for a GtkPageSetup
+
+static const char GLOM_NODE_LIBRARY_MODULES[] = "library_modules";
+static const char GLOM_NODE_LIBRARY_MODULE[] = "module";
+static const char GLOM_ATTRIBUTE_LIBRARY_MODULE_NAME[] = "name";
+static const char GLOM_ATTRIBUTE_LIBRARY_MODULE_SCRIPT[] = "script"; //deprecated
//A built-in relationship that is available for every table:
-#define GLOM_RELATIONSHIP_NAME_SYSTEM_PROPERTIES "system_properties"
+static const char GLOM_RELATIONSHIP_NAME_SYSTEM_PROPERTIES[] = "system_properties";
/// Can be used with std::find_if() to find a layout with the same parent_table and layout_name.
diff --git a/glom/libglom/document/document.h b/glom/libglom/document/document.h
index f941a67..2bbdee7 100644
--- a/glom/libglom/document/document.h
+++ b/glom/libglom/document/document.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef DOCUMENT_GLOM_H
-#define DOCUMENT_GLOM_H
+#ifndef GLOM_DOCUMENT_H
+#define GLOM_DOCUMENT_H
#include <libglom/libglom_config.h>
@@ -631,4 +631,4 @@ private:
} //namespace Glom
-#endif //DOCUMENT_GLOM_H
+#endif // GLOM_DOCUMENT_H
diff --git a/glom/libglom/document/view.h b/glom/libglom/document/view.h
index 0970688..c3fba0a 100644
--- a/glom/libglom/document/view.h
+++ b/glom/libglom/document/view.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef DOCUMENT_GLOM_VIEW_H
-#define DOCUMENT_GLOM_VIEW_H
+#ifndef GLOM_DOCUMENT_VIEW_H
+#define GLOM_DOCUMENT_VIEW_H
#include <libglom/document/document.h>
#include <libglom/document/bakery/view/view_composite.h>
@@ -34,4 +34,4 @@ typedef GlomBakery::View_Composite<Document> View_Composite_Glom;
} //namespace Glom
-#endif //DOCUMENT_GLOM_VIEW_H
+#endif // GLOM_DOCUMENT_VIEW_H
diff --git a/glom/mode_data/box_data.h b/glom/mode_data/box_data.h
index 6168929..a0122ca 100644
--- a/glom/mode_data/box_data.h
+++ b/glom/mode_data/box_data.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef BOX_DATA_H
-#define BOX_DATA_H
+#ifndef GLOM_MODE_DATA_BOX_DATA_H
+#define GLOM_MODE_DATA_BOX_DATA_H
#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
@@ -145,4 +145,4 @@ protected:
} //namespace Glom
-#endif
+#endif // GLOM_MODE_DATA_BOX_DATA_H
diff --git a/glom/mode_data/box_data_calendar_related.h b/glom/mode_data/box_data_calendar_related.h
index 98f0c15..55aaf7b 100644
--- a/glom/mode_data/box_data_calendar_related.h
+++ b/glom/mode_data/box_data_calendar_related.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef BOX_DATA_CALENDAR_RELATED_H
-#define BOX_DATA_CALENDAR_RELATED_H
+#ifndef GLOM_DATA_BOX_DATA_CALENDAR_RELATED_H
+#define GLOM_DATA_BOX_DATA_CALENDAR_RELATED_H
#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
@@ -114,4 +114,4 @@ private:
} //namespace Glom
-#endif
+#endif // GLOM_MODE_DATA_BOX_DATA_CALENDAR_RELATED_H
diff --git a/glom/mode_data/box_data_details.h b/glom/mode_data/box_data_details.h
index f5fe312..c67dc97 100644
--- a/glom/mode_data/box_data_details.h
+++ b/glom/mode_data/box_data_details.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef BOX_DATA_DETAILS_H
-#define BOX_DATA_DETAILS_H
+#ifndef GLOM_MODE_DATA_BOX_DATA_DETAILS_H
+#define GLOM_MODE_DATA_BOX_DATA_DETAILS_H
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
@@ -180,4 +180,4 @@ protected:
} //namespace Glom
-#endif //BOX_DATA_DETAILS_H
+#endif // GLOM_MODE_DATA_BOX_DATA_DETAILS_H
diff --git a/glom/mode_data/box_data_list.h b/glom/mode_data/box_data_list.h
index ab43fb6..d055243 100644
--- a/glom/mode_data/box_data_list.h
+++ b/glom/mode_data/box_data_list.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef BOX_DATA_LIST_H
-#define BOX_DATA_LIST_H
+#ifndef GLOM_MODE_DATA_BOX_DATA_LIST_H
+#define GLOM_MODE_DATA_BOX_DATA_LIST_H
#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
@@ -120,4 +120,4 @@ protected:
} //namespace Glom
-#endif
+#endif // GLOM_MODE_DATA_BOX_DATA_LIST_H
diff --git a/glom/mode_data/box_data_list_related.h b/glom/mode_data/box_data_list_related.h
index 8fbb21a..68d09c1 100644
--- a/glom/mode_data/box_data_list_related.h
+++ b/glom/mode_data/box_data_list_related.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef BOX_DATA_LIST_RELATED_H
-#define BOX_DATA_LIST_RELATED_H
+#ifndef GLOM_MODE_DATA_BOX_DATA_LIST_RELATED_H
+#define GLOM_MODE_DATA_BOX_DATA_LIST_RELATED_H
#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
@@ -89,4 +89,4 @@ protected:
} //namespace Glom
-#endif
+#endif // GLOM_MODE_DATA_BOX_DATA_LIST_RELATED_H
diff --git a/glom/mode_data/box_data_manyrecords.h b/glom/mode_data/box_data_manyrecords.h
index eb71253..043abe7 100644
--- a/glom/mode_data/box_data_manyrecords.h
+++ b/glom/mode_data/box_data_manyrecords.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef BOX_DATA_MANY_RECORDS_H
-#define BOX_DATA_MANY_RECORDS_H
+#ifndef GLOM_MODE_DATA_BOX_DATA_MANY_RECORDS_H
+#define GLOM_MODE_DATA_BOX_DATA_MANY_RECORDS_H
#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
@@ -70,4 +70,4 @@ protected:
} //namespace Glom
-#endif
+#endif // GLOM_MODE_DATA_BOX_DATA_MANY_RECORDS_H
diff --git a/glom/mode_data/box_data_portal.h b/glom/mode_data/box_data_portal.h
index ad4189d..87ba2a6 100644
--- a/glom/mode_data/box_data_portal.h
+++ b/glom/mode_data/box_data_portal.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef BOX_DATA_PORTAL_H
-#define BOX_DATA_PORTAL_H
+#ifndef GLOM_MODE_DATA_BOX_DATA_PORTAL_H
+#define GLOM_MODE_DATA_BOX_DATA_PORTAL_H
#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
@@ -140,4 +140,4 @@ private:
} //namespace Glom
-#endif //BOX_DATA_PORTAL_H
+#endif // GLOM_MODE_DATA_BOX_DATA_PORTAL_H
diff --git a/glom/mode_data/datawidget/checkbutton.h b/glom/mode_data/datawidget/checkbutton.h
index 4022caa..cd36ca7 100644
--- a/glom/mode_data/datawidget/checkbutton.h
+++ b/glom/mode_data/datawidget/checkbutton.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_UTILITY_WIDGETS_CHECK_GLOM_H
-#define GLOM_UTILITY_WIDGETS_CHECK_GLOM_H
+#ifndef GLOM_MODE_DATA_CHECK_BUTTON_H
+#define GLOM_MODE_DATA_CHECK_BUTTON_H
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
@@ -60,5 +60,4 @@ private:
} //namespace DataWidetChildren
} //namespace Glom
-#endif //GLOM_UTILITY_WIDGETS_CHECK_GLOM_H
-
+#endif // GLOM_MODE_DATA_CHECK_BUTTON_H
diff --git a/glom/mode_data/datawidget/combo.h b/glom/mode_data/datawidget/combo.h
index 4620fb5..765412a 100644
--- a/glom/mode_data/datawidget/combo.h
+++ b/glom/mode_data/datawidget/combo.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_UTILITY_WIDGETS_COMBO_GLOM_H
-#define GLOM_UTILITY_WIDGETS_COMBO_GLOM_H
+#ifndef GLOM_MODE_DATA_COMBO_H
+#define GLOM_MODE_DATA_COMBO_H
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
@@ -106,5 +106,4 @@ private:
} //namespace DataWidetChildren
} //namespace Glom
-#endif //GLOM_UTILITY_WIDGETS_COMBOENTRY_GLOM_H
-
+#endif // GLOM_MODE_DATA_COMBO_H
diff --git a/glom/mode_data/datawidget/combochoiceswithtreemodel.h b/glom/mode_data/datawidget/combochoiceswithtreemodel.h
index 4fc23cf..2619309 100644
--- a/glom/mode_data/datawidget/combochoiceswithtreemodel.h
+++ b/glom/mode_data/datawidget/combochoiceswithtreemodel.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_UTILITY_WIDGETS_COMBO_CHOICES_WITH_TREE_MODEL_H
-#define GLOM_UTILITY_WIDGETS_COMBO_CHOICES_WITH_TREE_MODEL_H
+#ifndef GLOM_MODE_DATA_COMBO_CHOICES_WITH_TREE_MODEL_H
+#define GLOM_MODE_DATA_COMBO_CHOICES_WITH_TREE_MODEL_H
#include <glom/mode_data/datawidget/combochoices.h>
@@ -66,5 +66,4 @@ protected:
} //namespace DataWidetChildren
} //namespace Glom
-#endif //GLOM_UTILITY_WIDGETS_COMBO_CHOICES_WITH_TREE_MODEL_H
-
+#endif // GLOM_MODE_DATA_COMBO_CHOICES_WITH_TREE_MODEL_H
diff --git a/glom/mode_data/datawidget/entry.h b/glom/mode_data/datawidget/entry.h
index dc11877..b61d1de 100644
--- a/glom/mode_data/datawidget/entry.h
+++ b/glom/mode_data/datawidget/entry.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_UTILITY_WIDGETS_ENTRY_GLOM_H
-#define GLOM_UTILITY_WIDGETS_ENTRY_GLOM_H
+#ifndef GLOM_MODE_DATA_ENTRY_H
+#define GLOM_MODE_DATA_ENTRY_H
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
@@ -97,5 +97,4 @@ private:
} //namespace DataWidetChildren
} //namespace Glom
-#endif //GLOM_UTILITY_WIDGETS_ENTRY_GLOM_H
-
+#endif // GLOM_MODE_DATA_ENTRY_H
diff --git a/glom/mode_data/flowtablewithfields.h b/glom/mode_data/flowtablewithfields.h
index 8cb7c38..d1844c5 100644
--- a/glom/mode_data/flowtablewithfields.h
+++ b/glom/mode_data/flowtablewithfields.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_UTILITYWIDGETS_FLOWTABLEWITHFIELDS_H
-#define GLOM_UTILITYWIDGETS_FLOWTABLEWITHFIELDS_H
+#ifndef GLOM_MODE_DATA_FLOWTABLEWITHFIELDS_H
+#define GLOM_MODE_DATA_FLOWTABLEWITHFIELDS_H
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
@@ -290,4 +290,4 @@ private:
} //namespace Glom
-#endif //GLOM_UTILITYWIDGETS_FLOWTABLEWITHFIELDS_H
+#endif // GLOM_MODE_DATA_FLOWTABLEWITHFIELDS_H
diff --git a/glom/mode_data/notebook_data.h b/glom/mode_data/notebook_data.h
index 05267b5..c562e2c 100644
--- a/glom/mode_data/notebook_data.h
+++ b/glom/mode_data/notebook_data.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef NOTEBOOK_DATA_H
-#define NOTEBOOK_DATA_H
+#ifndef GLOM_MODE_DATA_NOTEBOOK_DATA_H
+#define GLOM_MODE_DATA_NOTEBOOK_DATA_H
#include <glom/notebook_glom.h>
#include <glom/mode_data/box_data_list.h>
@@ -114,4 +114,4 @@ protected:
} //namespace Glom
-#endif
+#endif // GLOM_MODE_DATA_NOTEBOOK_DATA_H
diff --git a/glom/mode_data/placeholder-glom.h b/glom/mode_data/placeholder-glom.h
index 55555b5..aac4083 100644
--- a/glom/mode_data/placeholder-glom.h
+++ b/glom/mode_data/placeholder-glom.h
@@ -22,14 +22,14 @@
* Boston, MA 02110-1301, USA.
*/
+#ifndef GLOM_MODE_DATA_PLACEHOLDER_GLOM_H
+#define GLOM_MODE_DATA_PLACEHOLDER_GLOM_H
+
#include <gtkmm.h>
#include <glom/utility_widgets/layoutwidgetbase.h>
//#include <libglom/data_structure/layout/layoutitem_button.h>
//#include <gtkmm/builder.h>
-#ifndef GLOM_UTILITY_WIDGETS_PLACEHOLDER_GLOM_H_
-#define GLOM_UTILITY_WIDGETS_PLACEHOLDER_GLOM_H_
-
namespace Glom
{
@@ -56,5 +56,4 @@ private:
} // namespace Glom
-#endif // GLOM_UTILITY_WIDGETS_PLACEHOLDER_GLOM_H_
-
+#endif // GLOM_MODE_DATA_PLACEHOLDER_GLOM_H
diff --git a/glom/mode_design/comboentry_currency.h b/glom/mode_design/comboentry_currency.h
index b2dfb0e..73ecc1b 100644
--- a/glom/mode_design/comboentry_currency.h
+++ b/glom/mode_design/comboentry_currency.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DESIGN_COMBOENTRY_CURRENCY_HH
-#define GLOM_MODE_DESIGN_COMBOENTRY_CURRENCY_HH
+#ifndef GLOM_MODE_DESIGN_COMBOENTRY_CURRENCY_H
+#define GLOM_MODE_DESIGN_COMBOENTRY_CURRENCY_H
#include <gtkmm/comboboxentry.h>
#include <gtkmm/builder.h>
@@ -57,5 +57,4 @@ private:
} //namespace Glom
-#endif //GLOM_MODE_DESIGN_COMBOENTRY_CURRENCY_HH
-
+#endif //GLOM_MODE_DESIGN_COMBOENTRY_CURRENCY_H
diff --git a/glom/mode_design/dialog_design.h b/glom/mode_design/dialog_design.h
index 209595e..328a74a 100644
--- a/glom/mode_design/dialog_design.h
+++ b/glom/mode_design/dialog_design.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_DIALOG_DESIGN_H
-#define GLOM_DIALOG_DESIGN_H
+#ifndef GLOM_MODE_DESIGN_DIALOG_DESIGN_H
+#define GLOM_MODE_DESIGN_DIALOG_DESIGN_H
#include <gtkmm.h>
#include <gtkmm/builder.h>
@@ -49,4 +49,4 @@ protected:
} //namespace Glom
-#endif //GLOM_DIALOG_DESIGN_H
+#endif // GLOM_MODE_DESIGN_DIALOG_DESIGN_H
diff --git a/glom/mode_design/dialog_initial_password.h b/glom/mode_design/dialog_initial_password.h
index 465e6fd..168e14e 100644
--- a/glom/mode_design/dialog_initial_password.h
+++ b/glom/mode_design/dialog_initial_password.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_DIALOG_NEWSELFHOSTEDCONNECTION_H
-#define GLOM_DIALOG_NEWSELFHOSTEDCONNECTION_H
+#ifndef GLOM_DIALOG_INITIAL_PASSWORD_H
+#define GLOM_DIALOG_INITIAL_PASSWORD_H
#include <gtkmm/dialog.h>
#include <gtkmm/builder.h>
@@ -59,4 +59,4 @@ private:
} //namespace Glom
-#endif //GLOM_DIALOG_NEWSELFHOSTEDCONNECTION_H
+#endif //GLOM_DIALOG_INITIAL_PASSWORD_H
diff --git a/glom/mode_design/fields/box_db_table_definition.h b/glom/mode_design/fields/box_db_table_definition.h
index 6e0a5ed..e9539a9 100644
--- a/glom/mode_design/fields/box_db_table_definition.h
+++ b/glom/mode_design/fields/box_db_table_definition.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef BOX_DB_TABLE_DEFINITION_H
-#define BOX_DB_TABLE_DEFINITION_H
+#ifndef GLOM_MODE_DESIGN_BOX_DB_TABLE_DEFINITION_H
+#define GLOM_MODE_DESIGN_BOX_DB_TABLE_DEFINITION_H
#include "../../box_db_table.h"
#include "dialog_fielddefinition.h"
@@ -69,4 +69,5 @@ private:
} //namespace Glom
-#endif
+#endif // GLOM_MODE_DESIGN_BOX_DB_TABLE_DEFINITION_H
+
diff --git a/glom/mode_design/fields/combo_fieldtype.h b/glom/mode_design/fields/combo_fieldtype.h
index 0760815..639b158 100644
--- a/glom/mode_design/fields/combo_fieldtype.h
+++ b/glom/mode_design/fields/combo_fieldtype.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef COMBO_FIELDTYPE_HH
-#define COMBO_FIELDTYPE_HH
+#ifndef GLOM_MODE_DESIGN_COMBO_FIELDTYPE_H
+#define GLOM_MODE_DESIGN_COMBO_FIELDTYPE_H
#include <libglom/data_structure/field.h>
#include <gtkmm/combobox.h>
@@ -90,6 +90,6 @@ private:
Glib::RefPtr<Gtk::ListStore> m_refTreeModel;
};
-#endif //COMBO_FIELDTYPE_HH
-
} //namespace Glom
+
+#endif // GLOM_MODE_DESIGN_COMBO_FIELDTYPE_H
diff --git a/glom/mode_design/fields/dialog_fieldcalculation.h b/glom/mode_design/fields/dialog_fieldcalculation.h
index 8f1d010..d9a216a 100644
--- a/glom/mode_design/fields/dialog_fieldcalculation.h
+++ b/glom/mode_design/fields/dialog_fieldcalculation.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef DIALOG_FIELDCALCULATION_H
-#define DIALOG_FIELDCALCULATION_H
+#ifndef GLOM_MODE_DESIGN_DIALOG_FIELDCALCULATION_H
+#define GLOM_MODE_DESIGN_DIALOG_FIELDCALCULATION_H
#include <gtkmm.h>
#include <gtkmm/builder.h>
@@ -59,4 +59,4 @@ private:
} //namespace Glom
-#endif //DIALOG_FIELDCALCULATION_H
+#endif // GLOM_MODE_DESIGN_DIALOG_FIELDCALCULATION_H
diff --git a/glom/mode_design/fields/dialog_fielddefinition.h b/glom/mode_design/fields/dialog_fielddefinition.h
index 236f09d..dc9fd66 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.h
+++ b/glom/mode_design/fields/dialog_fielddefinition.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef DIALOG_FIELDDEFINITION_H
-#define DIALOG_FIELDDEFINITION_H
+#ifndef GLOM_MODE_DESIGN_DIALOG_FIELDDEFINITION_H
+#define GLOM_MODE_DESIGN_DIALOG_FIELDDEFINITION_H
#include <gtkmm.h>
#include "../../utility_widgets/combo_textglade.h"
@@ -100,4 +100,4 @@ private:
} //namespace Glom
-#endif //DIALOG_FIELDDEFINITION_H
+#endif // GLOM_MODE_DESIGN_DIALOG_FIELDDEFINITION_H
diff --git a/glom/mode_design/layout/combobox_fields.h b/glom/mode_design/layout/combobox_fields.h
index 2794a22..7e95b10 100644
--- a/glom/mode_design/layout/combobox_fields.h
+++ b/glom/mode_design/layout/combobox_fields.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_TRANSLATION_COMBOBOX_FIELDS_HH
-#define GLOM_TRANSLATION_COMBOBOX_FIELDS_HH
+#ifndef GLOM_MODE_DESIGN_COMBOBOX_FIELDS_H
+#define GLOM_MODE_DESIGN_COMBOBOX_FIELDS_H
#include <gtkmm/combobox.h>
#include <gtkmm/builder.h>
@@ -95,5 +95,4 @@ private:
} //namespace Glom
-#endif //GLOM_TRANSLATION_COMBOBOX_FIELDS_HH
-
+#endif // GLOM_MODE_DESIGN_COMBOBOX_FIELDS_H
diff --git a/glom/mode_design/layout/combobox_relationship.h b/glom/mode_design/layout/combobox_relationship.h
index 0273ffc..6d8c118 100644
--- a/glom/mode_design/layout/combobox_relationship.h
+++ b/glom/mode_design/layout/combobox_relationship.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_TRANSLATION_COMBOBOX_RELATIONSHIP_HH
-#define GLOM_TRANSLATION_COMBOBOX_RELATIONSHIP_HH
+#ifndef GLOM_MODE_DESIGN_COMBOBOX_RELATIONSHIP_H
+#define GLOM_MODE_DESIGN_COMBOBOX_RELATIONSHIP_H
#include <gtkmm/combobox.h>
#include <gtkmm/builder.h>
@@ -90,5 +90,4 @@ private:
} //namespace Glom
-#endif //GLOM_TRANSLATION_COMBOBOX_RELATIONSHIP_HH
-
+#endif // GLOM_MODE_DESIGN_COMBOBOX_RELATIONSHIP_H
diff --git a/glom/mode_design/layout/dialog_choose_field.h b/glom/mode_design/layout/dialog_choose_field.h
index 094c4a7..6e6a63d 100644
--- a/glom/mode_design/layout/dialog_choose_field.h
+++ b/glom/mode_design/layout/dialog_choose_field.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DATA_DIALOG_CHOOSE_FIELD_H
-#define GLOM_MODE_DATA_DIALOG_CHOOSE_FIELD_H
+#ifndef GLOM_MODE_DESIGN_DIALOG_CHOOSE_FIELD_H
+#define GLOM_MODE_DESIGN_DIALOG_CHOOSE_FIELD_H
#include <gtkmm.h>
#include <glom/utility_widgets/dialog_properties.h>
@@ -93,4 +93,4 @@ private:
} //namespace Glom
-#endif //GLOM_MODE_DATA_DIALOG_CHOOSE_FIELD_H
+#endif // GLOM_MODE_DESIGN_DIALOG_CHOOSE_FIELD_H
diff --git a/glom/mode_design/layout/dialog_choose_relationship.h b/glom/mode_design/layout/dialog_choose_relationship.h
index 833783e..f7e1f68 100644
--- a/glom/mode_design/layout/dialog_choose_relationship.h
+++ b/glom/mode_design/layout/dialog_choose_relationship.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DATA_DIALOG_CHOOSE_RELATIONSHIP_H
-#define GLOM_MODE_DATA_DIALOG_CHOOSE_RELATIONSHIP_H
+#ifndef GLOM_MODE_DESIGN_DIALOG_CHOOSE_RELATIONSHIP_H
+#define GLOM_MODE_DESIGN_DIALOG_CHOOSE_RELATIONSHIP_H
#include <gtkmm/dialog.h>
#include <glom/utility_widgets/dialog_properties.h>
@@ -78,4 +78,4 @@ private:
} //namespace Glom
-#endif //GLOM_MODE_DATA_DIALOG_CHOOSE_RELATIONSHIP_H
+#endif // GLOM_MODE_DESIGN_DIALOG_CHOOSE_RELATIONSHIP_H
diff --git a/glom/mode_design/layout/dialog_layout.h b/glom/mode_design/layout/dialog_layout.h
index 9a13a64..44b148f 100644
--- a/glom/mode_design/layout/dialog_layout.h
+++ b/glom/mode_design/layout/dialog_layout.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DATA_DIALOG_LAYOUT_H
-#define GLOM_MODE_DATA_DIALOG_LAYOUT_H
+#ifndef GLOM_MODE_DESIGN_DIALOG_LAYOUT_H
+#define GLOM_MODE_DESIGN_DIALOG_LAYOUT_H
#include <gtkmm/dialog.h>
#include <glom/utility_widgets/dialog_properties.h>
@@ -77,4 +77,4 @@ protected:
} //namespace Glom
-#endif //GLOM_MODE_DATA_DIALOG_LAYOUT_H
+#endif // GLOM_MODE_DESIGN_DIALOG_LAYOUT_H
diff --git a/glom/mode_design/layout/dialog_layout_calendar_related.h b/glom/mode_design/layout/dialog_layout_calendar_related.h
index 8c5b766..28931b2 100644
--- a/glom/mode_design/layout/dialog_layout_calendar_related.h
+++ b/glom/mode_design/layout/dialog_layout_calendar_related.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_RELATED_H
-#define GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_RELATED_H
+#ifndef GLOM_MODE_DESIGN_DIALOG_LAYOUT_LIST_RELATED_H
+#define GLOM_MODE_DESIGN_DIALOG_LAYOUT_LIST_RELATED_H
#include <glom/mode_design/layout/dialog_layout_list.h>
#include <libglom/data_structure/layout/layoutitem_calendarportal.h>
@@ -83,4 +83,4 @@ private:
} //namespace Glom
-#endif //GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_RELATED_H
+#endif // GLOM_MODE_DESIGN_DIALOG_LAYOUT_LIST_RELATED_H
diff --git a/glom/mode_design/layout/dialog_layout_details.h b/glom/mode_design/layout/dialog_layout_details.h
index 4b080ea..3059d46 100644
--- a/glom/mode_design/layout/dialog_layout_details.h
+++ b/glom/mode_design/layout/dialog_layout_details.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DATA_DIALOG_LAYOUT_DETAILS_H
-#define GLOM_MODE_DATA_DIALOG_LAYOUT_DETAILS_H
+#ifndef GLOM_MODE_DESIGN_DIALOG_LAYOUT_DETAILS_H
+#define GLOM_MODE_DESIGN_DIALOG_LAYOUT_DETAILS_H
#include <glom/mode_design/layout/dialog_layout.h>
#include <glom/mode_design/layout/treestore_layout.h>
@@ -126,4 +126,4 @@ protected:
} //namespace Glom
-#endif //GLOM_MODE_DATA_DIALOG_LAYOUT_DETAILS_H
+#endif // GLOM_MODE_DESIGN_DIALOG_LAYOUT_DETAILS_H
diff --git a/glom/mode_design/layout/dialog_layout_export.h b/glom/mode_design/layout/dialog_layout_export.h
index 9e46ea4..5fa32b6 100644
--- a/glom/mode_design/layout/dialog_layout_export.h
+++ b/glom/mode_design/layout/dialog_layout_export.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DATA_DIALOG_LAYOUT_EXPORT_H
-#define GLOM_MODE_DATA_DIALOG_LAYOUT_EXPORT_H
+#ifndef GLOM_MODE_DESIGN_DIALOG_LAYOUT_EXPORT_H
+#define GLOM_MODE_DESIGN_DIALOG_LAYOUT_EXPORT_H
#include <glom/mode_design/layout/dialog_layout.h>
@@ -88,4 +88,4 @@ private:
} //namespace Glom
-#endif //GLOM_MODE_DATA_DIALOG_LAYOUT_EXPORT_H
+#endif // GLOM_MODE_DESIGN_DIALOG_LAYOUT_EXPORT_H
diff --git a/glom/mode_design/layout/dialog_layout_list.h b/glom/mode_design/layout/dialog_layout_list.h
index 682c608..d14a186 100644
--- a/glom/mode_design/layout/dialog_layout_list.h
+++ b/glom/mode_design/layout/dialog_layout_list.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_H
-#define GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_H
+#ifndef GLOM_MODE_DESIGN_DIALOG_LAYOUT_LIST_H
+#define GLOM_MODE_DESIGN_DIALOG_LAYOUT_LIST_H
#include <glom/mode_design/layout/dialog_layout_details.h>
@@ -38,4 +38,4 @@ public:
} //namespace Glom
-#endif //GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_H
+#endif // GLOM_MODE_DESIGN_DIALOG_LAYOUT_LIST_H
diff --git a/glom/mode_design/layout/dialog_layout_list_related.h b/glom/mode_design/layout/dialog_layout_list_related.h
index 5f49791..161af86 100644
--- a/glom/mode_design/layout/dialog_layout_list_related.h
+++ b/glom/mode_design/layout/dialog_layout_list_related.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_RELATED_H
-#define GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_RELATED_H
+#ifndef GLOM_MODE_DESIGN_DIALOG_LAYOUT_LIST_RELATED_H
+#define GLOM_MODE_DESIGN_DIALOG_LAYOUT_LIST_RELATED_H
#include <glom/mode_design/layout/dialog_layout_list.h>
#include <glom/utility_widgets/combo_textglade.h>
@@ -80,4 +80,4 @@ protected:
} //namespace Glom
-#endif //GLOM_MODE_DATA_DIALOG_LAYOUT_LIST_RELATED_H
+#endif // GLOM_MODE_DESIGN_DIALOG_LAYOUT_LIST_RELATED_H
diff --git a/glom/mode_design/layout/layout_item_dialogs/box_formatting.h b/glom/mode_design/layout/layout_item_dialogs/box_formatting.h
index 6e31676..9372553 100644
--- a/glom/mode_design/layout/layout_item_dialogs/box_formatting.h
+++ b/glom/mode_design/layout/layout_item_dialogs/box_formatting.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_BOX_FORMATTING_H
-#define GLOM_BOX_FORMATTING_H
+#ifndef GLOM_MODE_DESIGN_BOX_FORMATTING_H
+#define GLOM_MODE_DESIGN_BOX_FORMATTING_H
#include <gtkmm.h>
#include <glom/utility_widgets/dialog_properties.h>
@@ -129,4 +129,4 @@ private:
} //namespace Glom
-#endif //GLOM_BOX_FORMATTING_H
+#endif // GLOM_MODE_DESIGN_BOX_FORMATTING_H
diff --git a/glom/mode_design/layout/layout_item_dialogs/combo_summarytype.h b/glom/mode_design/layout/layout_item_dialogs/combo_summarytype.h
index 8b0d8b7..539ce45 100644
--- a/glom/mode_design/layout/layout_item_dialogs/combo_summarytype.h
+++ b/glom/mode_design/layout/layout_item_dialogs/combo_summarytype.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DESIGN_COMBO_SUMMARYTYPE_HH
-#define GLOM_MODE_DESIGN_COMBO_SUMMARYTYPE_HH
+#ifndef GLOM_MODE_DESIGN_COMBO_SUMMARYTYPE_H
+#define GLOM_MODE_DESIGN_COMBO_SUMMARYTYPE_H
#include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
#include <gtkmm/combobox.h>
@@ -59,5 +59,4 @@ private:
} //namespace Glom
-#endif //GLOM_MODE_DESIGN_COMBO_SUMMARYTYPE_HH
-
+#endif //GLOM_MODE_DESIGN_COMBO_SUMMARYTYPE_H
diff --git a/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.h b/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.h
index 7ec61fa..779a765 100644
--- a/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.h
+++ b/glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DESIGN_COMBOENTRY_BORDERWIDTH_HH
-#define GLOM_MODE_DESIGN_COMBOENTRY_BORDERWIDTH_HH
+#ifndef GLOM_MODE_DESIGN_COMBOENTRY_BORDERWIDTH_H
+#define GLOM_MODE_DESIGN_COMBOENTRY_BORDERWIDTH_H
#include <gtkmm/comboboxentry.h>
#include <gtkmm/builder.h>
@@ -58,5 +58,4 @@ private:
} //namespace Glom
-#endif //GLOM_MODE_DESIGN_COMBOENTRY_BORDERWIDTH_HH
-
+#endif // GLOM_MODE_DESIGN_COMBOENTRY_BORDERWIDTH_H
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h b/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h
index 45c34dc..d737b28 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef DIALOG_BUTTONSCRIPT_H
-#define DIALOG_BUTTONSCRIPT_H
+#ifndef GLOM_MODE_DESIGN_DIALOG_BUTTONSCRIPT_H
+#define GLOM_MODE_DESIGN_DIALOG_BUTTONSCRIPT_H
#include <gtkmm.h>
#include <gtkmm/builder.h>
@@ -60,4 +60,4 @@ private:
} //namespace Glom
-#endif //DIALOG_BUTTONSCRIPT_H
+#endif // GLOM_MODE_DESIGN_DIALOG_BUTTONSCRIPT_H
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h b/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h
index b3703ad..95daf8d 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DATA_DIALOG_FIELD_LAYOUT_H
-#define GLOM_MODE_DATA_DIALOG_FIELD_LAYOUT_H
+#ifndef GLOM_MODE_DESIGN_DIALOG_FIELD_LAYOUT_H
+#define GLOM_MODE_DESIGN_DIALOG_FIELD_LAYOUT_H
#include <gtkmm.h>
#include <glom/utility_widgets/dialog_properties.h>
@@ -76,4 +76,4 @@ private:
} //namespace Glom
-#endif //GLOM_MODE_DATA_DIALOG_FIELD_LAYOUT_H
+#endif // GLOM_MODE_DESIGN_DIALOG_FIELD_LAYOUT_H
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_formatting.h b/glom/mode_design/layout/layout_item_dialogs/dialog_formatting.h
index 7c36c63..75d375a 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_formatting.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_formatting.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DATA_DIALOG_FORMATTING_H
-#define GLOM_MODE_DATA_DIALOG_FORMATTING_H
+#ifndef GLOM_MODE_DESIGN_DIALOG_FORMATTING_H
+#define GLOM_MODE_DESIGN_DIALOG_FORMATTING_H
#include <gtkmm.h>
#include <glom/utility_widgets/dialog_properties.h>
@@ -59,4 +59,4 @@ private:
} //namespace Glom
-#endif //GLOM_MODE_DATA_DIALOG_FORMATTING_H
+#endif // GLOM_MODE_DESIGN_DIALOG_FORMATTING_H
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_groupby_secondaryfields.h b/glom/mode_design/layout/layout_item_dialogs/dialog_groupby_secondaryfields.h
index 495c2ee..1912e80 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_groupby_secondaryfields.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_groupby_secondaryfields.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DATA_DIALOG_GROUPBY_SECONDARYFIELDS_HH
-#define GLOM_MODE_DATA_DIALOG_GROUPBY_SECONDARYFIELDS_HH
+#ifndef GLOM_MODE_DESIGN_DIALOG_GROUPBY_SECONDARYFIELDS_H
+#define GLOM_MODE_DESIGN_DIALOG_GROUPBY_SECONDARYFIELDS_H
#include <glom/base_db.h>
#include <glom/mode_design/layout/dialog_layout.h>
@@ -87,4 +87,4 @@ private:
} //namespace Glom
-#endif //GLOM_MODE_DATA_DIALOG_GROUPBY_SECONDARYFIELDS_HH
+#endif // GLOM_MODE_DESIGN_DIALOG_GROUPBY_SECONDARYFIELDS_H
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_groupby_sortfields.h b/glom/mode_design/layout/layout_item_dialogs/dialog_groupby_sortfields.h
index 3c246e7..84a492a 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_groupby_sortfields.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_groupby_sortfields.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DATA_DIALOG_GROUPBY_SORTFIELDS_HH
-#define GLOM_MODE_DATA_DIALOG_GROUPBY_SORTFIELDS_HH
+#ifndef GLOM_MODE_DESIGN_DIALOG_GROUPBY_SORTFIELDS_H
+#define GLOM_MODE_DESIGN_DIALOG_GROUPBY_SORTFIELDS_H
#include <glom/base_db.h>
#include <glom/mode_design/layout/dialog_layout.h>
@@ -86,4 +86,4 @@ private:
} //namespace Glom
-#endif //GLOM_MODE_DATA_DIALOG_GROUPBY_SORTFIELDS_HH
+#endif // GLOM_MODE_DESIGN_DIALOG_GROUPBY_SORTFIELDS_H
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.h b/glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.h
index 18e0f07..870153a 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef DIALOG_IMAGEOBJECT_H
-#define DIALOG_IMAGEOBJECT_H
+#ifndef GLOM_MODE_DESIGN_DIALOG_IMAGEOBJECT_H
+#define GLOM_MODE_DESIGN_DIALOG_IMAGEOBJECT_H
#include <gtkmm.h>
#include <gtkmm/builder.h>
@@ -59,4 +59,4 @@ private:
} //namespace Glom
-#endif //DIALOG_IMAGEOBJECT_H
+#endif // GLOM_MODE_DESIGN_DIALOG_IMAGEOBJECT_H
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h b/glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h
index 9a0bb7e..d663104 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DATA_DIALOG_NOTEBOOK_HH
-#define GLOM_MODE_DATA_DIALOG_NOTEBOOK_HH
+#ifndef GLOM_MODE_DESIGN_DIALOG_NOTEBOOK_H
+#define GLOM_MODE_DESIGN_DIALOG_NOTEBOOK_H
#include <glom/base_db.h>
#include <glom/mode_design/layout/dialog_layout.h>
@@ -85,4 +85,4 @@ private:
} //namespace Glom
-#endif //GLOM_MODE_DATA_DIALOG_NOTEBOOK_HH
+#endif // GLOM_MODE_DESIGN_DIALOG_NOTEBOOK_H
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_textobject.h b/glom/mode_design/layout/layout_item_dialogs/dialog_textobject.h
index d0037b0..6b426f7 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_textobject.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_textobject.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef DIALOG_TEXTOBJECT_H
-#define DIALOG_TEXTOBJECT_H
+#ifndef GLOM_MODE_DESIGN_DIALOG_TEXTOBJECT_H
+#define GLOM_MODE_DESIGN_DIALOG_TEXTOBJECT_H
#include <gtkmm.h>
#include <gtkmm/builder.h>
@@ -56,4 +56,4 @@ private:
} //namespace Glom
-#endif //DIALOG_TEXTOBJECT_H
+#endif // GLOM_MODE_DESIGN_DIALOG_TEXTOBJECT_H
diff --git a/glom/mode_design/layout/treestore_layout.h b/glom/mode_design/layout/treestore_layout.h
index c6aa5f7..91f226a 100644
--- a/glom/mode_design/layout/treestore_layout.h
+++ b/glom/mode_design/layout/treestore_layout.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DATA_TREESTORE_LAYOUT_H
-#define GLOM_MODE_DATA_TREESTORE_LAYOUT_H
+#ifndef GLOM_MODE_DESIGN_TREESTORE_LAYOUT_H
+#define GLOM_MODE_DESIGN_TREESTORE_LAYOUT_H
#include <gtkmm/treestore.h>
#include <libglom/data_structure/layout/layoutitem_portal.h>
@@ -63,5 +63,4 @@ private:
} //namespace Glom
-#endif //GLOM_MODE_DATA_TREESTORE_LAYOUT_H
-
+#endif // GLOM_MODE_DESIGN_TREESTORE_LAYOUT_H
diff --git a/glom/mode_design/print_layouts/print_layout_toolbar.h b/glom/mode_design/print_layouts/print_layout_toolbar.h
index ccd4257..e2541cb 100644
--- a/glom/mode_design/print_layouts/print_layout_toolbar.h
+++ b/glom/mode_design/print_layouts/print_layout_toolbar.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_UTILITY_WIDGETS_DRAGBAR_H
-#define GLOM_UTILITY_WIDGETS_DRAGBAR_H
+#ifndef GLOM_PRINT_LAYOUT_TOOLBAR_H
+#define GLOM_PRINT_LAYOUT_TOOLBAR_H
#include <gtkmm/box.h>
#include <glom/mode_design/print_layouts/print_layout_toolbar_button.h>
@@ -46,4 +46,4 @@ private:
} //namespace Glom
-#endif // GLOM_UTILITY_WIDGETS_DRAGBAR_H
+#endif // GLOM_PRINT_LAYOUT_TOOLBAR_H
diff --git a/glom/mode_design/report_layout/dialog_layout_report.h b/glom/mode_design/report_layout/dialog_layout_report.h
index ae6fad6..cb5d97f 100644
--- a/glom/mode_design/report_layout/dialog_layout_report.h
+++ b/glom/mode_design/report_layout/dialog_layout_report.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_DIALOG_LAYOUT_REPORT
-#define GLOM_DIALOG_LAYOUT_REPORT
+#ifndef GLOM_DIALOG_LAYOUT_REPORT_H
+#define GLOM_DIALOG_LAYOUT_REPORT_H
#include <glom/mode_design/layout/dialog_layout.h>
#include <libglom/data_structure/report.h>
@@ -128,4 +128,4 @@ private:
} //namespace Glom
-#endif //GLOM_DIALOG_LAYOUT_REPORT
+#endif //GLOM_DIALOG_LAYOUT_REPORT_H
diff --git a/glom/mode_design/translation/combobox_locale.h b/glom/mode_design/translation/combobox_locale.h
index dda0057..d456d0a 100644
--- a/glom/mode_design/translation/combobox_locale.h
+++ b/glom/mode_design/translation/combobox_locale.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_TRANSLATION_COMBOBOX_LOCALE_HH
-#define GLOM_TRANSLATION_COMBOBOX_LOCALE_HH
+#ifndef GLOM_TRANSLATION_COMBOBOX_LOCALE_H
+#define GLOM_TRANSLATION_COMBOBOX_LOCALE_H
#include <glom/mode_design/iso_codes.h>
#include <gtkmm/combobox.h>
@@ -61,5 +61,4 @@ private:
} //namespace Glom
-#endif //GLOM_TRANSLATION_COMBOBOX_LOCALE_HH
-
+#endif //GLOM_TRANSLATION_COMBOBOX_LOCALE_H
diff --git a/glom/mode_find/box_data_details_find.h b/glom/mode_find/box_data_details_find.h
index b80d816..fc236b1 100644
--- a/glom/mode_find/box_data_details_find.h
+++ b/glom/mode_find/box_data_details_find.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef BOX_DATA_DETAILS_FIND_H
-#define BOX_DATA_DETAILS_FIND_H
+#ifndef GLOM_BOX_DATA_DETAILS_FIND_H
+#define GLOM_BOX_DATA_DETAILS_FIND_H
#include "../mode_data/box_data_details.h"
@@ -47,4 +47,4 @@ private:
} //namespace Glom
-#endif
+#endif // GLOM_BOX_DATA_DETAILS_FIND_H
diff --git a/glom/mode_find/box_data_list_find.h b/glom/mode_find/box_data_list_find.h
index 112ca09..34ab7fd 100644
--- a/glom/mode_find/box_data_list_find.h
+++ b/glom/mode_find/box_data_list_find.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef BOX_DATA_LIST_FIND_H
-#define BOX_DATA_LIST_FIND_H
+#ifndef GLOM_BOX_DATA_LIST_FIND_H
+#define GLOM_BOX_DATA_LIST_FIND_H
#include "../mode_data/box_data_list.h"
@@ -47,4 +47,4 @@ private:
} //namespace Glom
-#endif
+#endif // GLOM_BOX_DATA_LIST_FIND_H
diff --git a/glom/mode_find/notebook_find.h b/glom/mode_find/notebook_find.h
index a91d7fd..7eb615e 100644
--- a/glom/mode_find/notebook_find.h
+++ b/glom/mode_find/notebook_find.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef NOTEBOOK_FIND_H
-#define NOTEBOOK_FIND_H
+#ifndef GLOM_NOTEBOOK_FIND_H
+#define GLOM_NOTEBOOK_FIND_H
#include "../mode_data/notebook_data.h"
#include "box_data_list_find.h"
@@ -63,4 +63,4 @@ private:
} //namespace Glom
-#endif
+#endif // GLOM_NOTEBOOK_FIND_H
diff --git a/glom/notebook_glom.h b/glom/notebook_glom.h
index a4edab5..f8f94b0 100644
--- a/glom/notebook_glom.h
+++ b/glom/notebook_glom.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef NOTEBOOK_GLOM_H
-#define NOTEBOOK_GLOM_H
+#ifndef GLOM_NOTEBOOK_GLOM_H
+#define GLOM_NOTEBOOK_GLOM_H
#include <glom/box_withbuttons.h>
#include <libglom/document/document.h>
@@ -67,4 +67,4 @@ protected:
} //namespace Glom
-#endif
+#endif // GLOM_NOTEBOOK_GLOM_H
diff --git a/glom/print_layout/canvas_print_layout.h b/glom/print_layout/canvas_print_layout.h
index 34100a1..597b3d8 100644
--- a/glom/print_layout/canvas_print_layout.h
+++ b/glom/print_layout/canvas_print_layout.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_CANVAS_PRINT_LAYOUT_EDIT_H
-#define GLOM_CANVAS_PRINT_LAYOUT_EDIT_H
+#ifndef GLOM_PRINT_LAYOUT_CANVAS_PRINT_LAYOUT_H
+#define GLOM_PRINT_LAYOUT_CANVAS_PRINT_LAYOUT_H
#include <glom/base_db.h>
#include <glom/utility_widgets/canvas/canvas_editable.h>
@@ -123,5 +123,4 @@ private:
} //namespace Glom
-#endif //GLOM_CANVAS_PRINT_LAYOUT_EDIT_H
-
+#endif // GLOM_PRINT_LAYOUT_CANVAS_PRINT_LAYOUT_H
diff --git a/glom/report_builder.h b/glom/report_builder.h
index f578963..2173bc8 100644
--- a/glom/report_builder.h
+++ b/glom/report_builder.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_REPORTS_REPORT_BUILDER
-#define GLOM_REPORTS_REPORT_BUILDER
+#ifndef GLOM_REPORT_BUILDER_H
+#define GLOM_REPORT_BUILDER_H
#include <glom/base_db.h>
#include <libglom/data_structure/report.h>
@@ -60,4 +60,4 @@ private:
} //namespace Glom
-#endif //GLOM_REPORTS_REPORT_BUILDER
+#endif // GLOM_REPORT_BUILDER_H
diff --git a/glom/signal_reemitter.h b/glom/signal_reemitter.h
index ca247b7..82b0fa3 100644
--- a/glom/signal_reemitter.h
+++ b/glom/signal_reemitter.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_PRIVS_H
-#define GLOM_PRIVS_H
+#ifndef GLOM_SIGNAL_REEMITTER_H
+#define GLOM_SIGNAL_REEMITTER_H
#include <sigc++/sigc++.h>
@@ -64,5 +64,4 @@ void signal_connect_for_reemit_1arg(sigc::signal1<void, T_arg1> sig_to_catch, co
} //namespace Glom
-#endif //GLOM_PRIVS_H
-
+#endif //GLOM_SIGNAL_REEMITTER_H
diff --git a/glom/utility_widgets/adddel/adddel.h b/glom/utility_widgets/adddel/adddel.h
index 364fc54..67de1aa 100644
--- a/glom/utility_widgets/adddel/adddel.h
+++ b/glom/utility_widgets/adddel/adddel.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef ADDDEL_H
-#define ADDDEL_H
+#ifndef GLOM_UTLITY_WIDGETS_ADDDEL_H
+#define GLOM_UTLITY_WIDGETS_ADDDEL_H
#include <gtkmm.h>
#include <libglom/data_structure/field.h>
@@ -330,4 +330,4 @@ guint AddDel::treeview_append_column(const Glib::ustring& title, const Gtk::Tree
} //namespace Glom
-#endif //ADDDEL_H
+#endif // GLOM_UTLITY_WIDGETS_ADDDEL_H
diff --git a/glom/utility_widgets/adddel/adddel_withbuttons.h b/glom/utility_widgets/adddel/adddel_withbuttons.h
index 86175a4..ef617a7 100644
--- a/glom/utility_widgets/adddel/adddel_withbuttons.h
+++ b/glom/utility_widgets/adddel/adddel_withbuttons.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef ADDDEL_WITHBUTTONS_H
-#define ADDDEL_WITHBUTTONS_H
+#ifndef GLOM_UTILITY_WIDGETS_ADDDEL_WITHBUTTONS_H
+#define GLOM_UTILITY_WIDGETS_ADDDEL_WITHBUTTONS_H
#include "adddel.h"
@@ -54,4 +54,4 @@ private:
} //namespace Glom
-#endif //ADDDEL_WITHBUTTONS_H
+#endif // GLOM_UTLITY_WIDGETS_ADDDEL_WITHBUTTONS_H
diff --git a/glom/utility_widgets/adddel/treeviewcolumn_glom.h b/glom/utility_widgets/adddel/treeviewcolumn_glom.h
index 5d4f937..915ca63 100644
--- a/glom/utility_widgets/adddel/treeviewcolumn_glom.h
+++ b/glom/utility_widgets/adddel/treeviewcolumn_glom.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef ADDDEL_TREEVIEWCOLUMN_GLOM_H
-#define ADDDEL_TREEVIEWCOLUMN_GLOM_H
+#ifndef GLOM_UTLITY_WIDGETS_ADDDEL_TREEVIEWCOLUMN_GLOM_H
+#define GLOM_UTLITY_WIDGETS_ADDDEL_TREEVIEWCOLUMN_GLOM_H
#include <gtkmm/treeviewcolumn.h>
diff --git a/glom/utility_widgets/cellrendererlist/cellrendererlist.h b/glom/utility_widgets/cellrendererlist/cellrendererlist.h
index cbeb618..1e6a5fe 100644
--- a/glom/utility_widgets/cellrendererlist/cellrendererlist.h
+++ b/glom/utility_widgets/cellrendererlist/cellrendererlist.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef ADDDEL_CELLRENDERERLIST_H
-#define ADDDEL_CELLRENDERERLIST_H
+#ifndef GLOM_UTILITY_WIDGETS_CELLRENDERERLIST_H
+#define GLOM_UTILITY_WIDGETS_CELLRENDERERLIST_H
#include <gtkmm.h>
//#include <gtkmm/cellrenderercombo.h>
@@ -71,4 +71,4 @@ private:
} //namespace Glom
-#endif //ADDDEL_CELLRENDERERLIST_H
+#endif // GLOM_UTLITY_WIDGETS_CELLRENDERERLIST_H
diff --git a/glom/utility_widgets/combo_textglade.h b/glom/utility_widgets/combo_textglade.h
index 8be867d..041ee11 100644
--- a/glom/utility_widgets/combo_textglade.h
+++ b/glom/utility_widgets/combo_textglade.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DESIGN_COMBO_TEXTGLADE_HH
-#define GLOM_MODE_DESIGN_COMBO_TEXTGLADE_HH
+#ifndef GLOM_UTILITY_WIDGETS_COMBO_TEXTGLADE_H
+#define GLOM_UTILITY_WIDGETS_COMBO_TEXTGLADE_H
#include <gtkmm/comboboxtext.h>
#include <gtkmm/builder.h>
@@ -42,5 +42,4 @@ public:
} //namespace Glom
-#endif //GLOM_MODE_DESIGN_COMBO_TEXTGLADE_HH
-
+#endif // GLOM_UTILITY_WIDGETS_COMBO_TEXTGLADE_H
diff --git a/glom/utility_widgets/db_adddel/glom_db_treemodel.h b/glom/utility_widgets/db_adddel/glom_db_treemodel.h
index 41b65aa..7f49b22 100644
--- a/glom/utility_widgets/db_adddel/glom_db_treemodel.h
+++ b/glom/utility_widgets/db_adddel/glom_db_treemodel.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DATA_DB_TREEMODEL_H
-#define GLOM_MODE_DATA_DB_TREEMODEL_H
+#ifndef GLOM_UTILITY_WIDGETS_DB_TREEMODEL_H
+#define GLOM_UTILITY_WIDGETS_DB_TREEMODEL_H
#include <gtkmm.h>
//#include <gtkmm/treemodel.h>
@@ -195,4 +195,4 @@ private:
} //namespace Glom
-#endif //GLOM_MODE_DATA_DB_TREEMODEL_H
+#endif // GLOM_UTILITY_WIDGETS_DB_TREEMODEL_H
diff --git a/glom/utility_widgets/dialog_flowtable.h b/glom/utility_widgets/dialog_flowtable.h
index 3f917a9..5ddceae 100644
--- a/glom/utility_widgets/dialog_flowtable.h
+++ b/glom/utility_widgets/dialog_flowtable.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef DIALOG_FLOWTABLE_H
-#define DIALOG_FLOWTABLE_H
+#ifndef GLOM_DIALOG_FLOWTABLE_H
+#define GLOM_DIALOG_FLOWTABLE_H
#include <gtkmm.h>
#include <gtkmm/builder.h>
@@ -56,4 +56,4 @@ private:
} //namespace Glom
-#endif //DIALOG_TEXTOBJECT_H
+#endif // GLOM_DIALOG_FLOWTABLE_H
diff --git a/glom/utility_widgets/dialog_image_progress.h b/glom/utility_widgets/dialog_image_progress.h
index dd70037..448c9e2 100644
--- a/glom/utility_widgets/dialog_image_progress.h
+++ b/glom/utility_widgets/dialog_image_progress.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_DIALOG_UTILITY_WIDGETSIMPORT_CSV_PROGRESS_H
-#define GLOM_DIALOG_UTILITY_WIDGETSIMPORT_CSV_PROGRESS_H
+#ifndef GLOM_UTILITY_WIDGETS_DIALOG_IMAGE_PROGRESS_H
+#define GLOM_UTILITY_WIDGETS_DIALOG_IMAGE_PROGRESS_H
#include <gtkmm/dialog.h>
#include <gtkmm/builder.h>
@@ -66,5 +66,4 @@ private:
} //namespace Glom
-#endif //GLOM_DIALOG_UTILITY_WIDGETSIMPORT_CSV_PROGRESS_H
-
+#endif // GLOM_UTILITY_WIDGETS_DIALOG_IMAGE_PROGRESS_H
diff --git a/glom/utility_widgets/flowtable_dnd.h b/glom/utility_widgets/flowtable_dnd.h
index 601b121..d04722b 100644
--- a/glom/utility_widgets/flowtable_dnd.h
+++ b/glom/utility_widgets/flowtable_dnd.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_UTILITYWIDGETS_FLOWTABLE_DND_H
-#define GLOM_UTILITYWIDGETS_FLOWTABLE_DND_H
+#ifndef GLOM_UTILITY_WIDGETS_FLOWTABLE_DND_H
+#define GLOM_UTILITY_WIDGETS_FLOWTABLE_DND_H
#include <gtkmm.h>
#include "flowtable.h"
@@ -85,4 +85,4 @@ private:
} // namespace Glom
-#endif // GLOM_UTILITYWIDGETS_FLOWTABLE_DND_H
+#endif // GLOM_UTILITY_WIDGETS_FLOWTABLE_DND_H
diff --git a/glom/utility_widgets/layoutwidgetbase.h b/glom/utility_widgets/layoutwidgetbase.h
index 3f3687c..bed69f4 100644
--- a/glom/utility_widgets/layoutwidgetbase.h
+++ b/glom/utility_widgets/layoutwidgetbase.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DATA_LAYOUT_WIDGET_BASE_H
-#define GLOM_MODE_DATA_LAYOUT_WIDGET_BASE_H
+#ifndef GLOM_UTILITY_WIDGETS_LAYOUT_WIDGET_BASE_H
+#define GLOM_UTILITY_WIDGETS_LAYOUT_WIDGET_BASE_H
#include <gtkmm.h>
#include <libglom/data_structure/layout/layoutitem.h>
@@ -113,4 +113,4 @@ private:
} //namespace Glom
-#endif //GLOM_MODE_DATA_LAYOUT_WIDGET_BASE_H
+#endif // GLOM_UTILITYWIDGETS_LAYOUT_WIDGET_BASE_H
diff --git a/glom/utility_widgets/layoutwidgetfield.h b/glom/utility_widgets/layoutwidgetfield.h
index bd1bb81..e4bfc81 100644
--- a/glom/utility_widgets/layoutwidgetfield.h
+++ b/glom/utility_widgets/layoutwidgetfield.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef GLOM_MODE_DATA_LAYOUT_WIDGET_FIELD_H
-#define GLOM_MODE_DATA_LAYOUT_WIDGET_FIELD_H
+#ifndef GLOM_UTILITY_WIDGETS_LAYOUT_WIDGET_FIELD_H
+#define GLOM_UTILITY_WIDGETS_LAYOUT_WIDGET_FIELD_H
#include "layoutwidgetmenu.h"
@@ -51,4 +51,4 @@ protected:
} //namespace Glom
-#endif //GLOM_MODE_DATA_LAYOUT_WIDGET_FIELD_H
+#endif // GLOM_UTLITY_WIDGETS_LAYOUT_WIDGET_FIELD_H
diff --git a/glom/utility_widgets/layoutwidgetutils.h b/glom/utility_widgets/layoutwidgetutils.h
index 85042d7..75bb74c 100644
--- a/glom/utility_widgets/layoutwidgetutils.h
+++ b/glom/utility_widgets/layoutwidgetutils.h
@@ -20,8 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _GLOM_LAYOUT_WIDGET_UTILS_H_
-#define _GLOM_LAYOUT_WIDGET_UTILS_H_
+#ifndef GLOM_UTILITY_WIDGETS_LAYOUT_WIDGET_UTILS_H
+#define GLOM_UTILITY_WIDGETS_LAYOUT_WIDGET_UTILS_H
#include <gtkmm.h>
#include "layoutwidgetbase.h"
@@ -54,4 +54,4 @@ protected:
} // namespace Glom
-#endif // _GLOM_LAYOUT_WIDGET_UTILS_H_
+#endif // GLOM_UTILITY_WIDGETS_LAYOUT_WIDGET_UTILS_H
diff --git a/glom/variablesmap.h b/glom/variablesmap.h
index d08e8cd..30c5fcf 100644
--- a/glom/variablesmap.h
+++ b/glom/variablesmap.h
@@ -17,8 +17,8 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifndef _GLOM_VARIABLESMAP_H
-#define _GLOM_VARIABLESMAP_H
+#ifndef GLOM_VARIABLESMAP_H
+#define GLOM_VARIABLESMAP_H
#include <gtkmm/builder.h>
#include <map>
@@ -85,6 +85,4 @@ protected:
} /* namespace Glom */
-#endif /* _GLOM_VARIABLESMAP_H */
-
-
+#endif /* GLOM_VARIABLESMAP_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
