glom r2040 - in trunk: . glom glom/layout_item_dialogs glom/libglom glom/libglom/data_structure glom/libglom/document glom/libglom/python_embed glom/mode_data glom/mode_design/print_layouts glom/relationships_overview glom/translation glom/utility_widgets glom/utility_widgets/db_adddel

[murrayc svn gnome org]

Author: murrayc
Date: Tue Mar 31 09:09:18 2009
New Revision: 2040
URL: http://svn.gnome.org/viewvc/glom?rev=2040&view=rev

Log:
2009-03-31  Murray Cumming  <murrayc murrayc com>

* glom/libglom/document/document_glom.[h|cc]: Renamed to document.[h|cc]:
* *.[h|cc]: Adapted.

Added:
   trunk/glom/libglom/document/document.cc   (contents, props changed)
      - copied, changed from r2039, /trunk/glom/libglom/document/document_glom.cc
   trunk/glom/libglom/document/document.h   (props changed)
      - copied unchanged from r2039, /trunk/glom/libglom/document/document_glom.h
Removed:
   trunk/glom/libglom/document/document_glom.cc
   trunk/glom/libglom/document/document_glom.h
Modified:
   trunk/ChangeLog
   trunk/glom/base_db.cc
   trunk/glom/box_withbuttons.h
   trunk/glom/combobox_fields.h
   trunk/glom/combobox_relationship.h
   trunk/glom/filechooser_export.h
   trunk/glom/frame_glom.h
   trunk/glom/glom_postgres.h
   trunk/glom/layout_item_dialogs/box_formatting.h
   trunk/glom/layout_item_dialogs/dialog_field_summary.h
   trunk/glom/layout_item_dialogs/dialog_group_by.h
   trunk/glom/libglom/connectionpool.cc
   trunk/glom/libglom/data_structure/iso_codes.cc
   trunk/glom/libglom/document/Makefile.am
   trunk/glom/libglom/document/view.h
   trunk/glom/libglom/python_embed/py_glom_record.h
   trunk/glom/libglom/python_embed/py_glom_relatedrecord.h
   trunk/glom/libglom/test_document.cc
   trunk/glom/mode_data/dialog_choose_field.h
   trunk/glom/mode_data/dialog_choose_relationship.h
   trunk/glom/mode_data/dialog_layout.h
   trunk/glom/mode_data/flowtablewithfields.h
   trunk/glom/mode_design/print_layouts/dialog_text_formatting.h
   trunk/glom/mode_design/print_layouts/window_print_layout_edit.h
   trunk/glom/notebook_glom.h
   trunk/glom/relationships_overview/canvas_group_dbtable.h
   trunk/glom/translation/dialog_copy_translation.h
   trunk/glom/utility_widgets/db_adddel/db_adddel.h
   trunk/glom/utility_widgets/dialog_choose_date.h
   trunk/glom/utility_widgets/dialog_choose_id.h
   trunk/glom/utility_widgets/filechooserdialog_saveextras.h

Modified: trunk/glom/base_db.cc
==============================================================================
--- trunk/glom/base_db.cc	(original)
+++ trunk/glom/base_db.cc	Tue Mar 31 09:09:18 2009
@@ -24,7 +24,7 @@
 #include "application.h" //App_Glom.
 #include <libglom/appstate.h>
 #include <libglom/standard_table_prefs_fields.h>
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <libglom/data_structure/glomconversions.h>
 #include "mode_data/dialog_choose_field.h"
 

Modified: trunk/glom/box_withbuttons.h
==============================================================================
--- trunk/glom/box_withbuttons.h	(original)
+++ trunk/glom/box_withbuttons.h	Tue Mar 31 09:09:18 2009
@@ -24,7 +24,7 @@
 #include <gtkmm.h>
 #include "utility_widgets/adddel/adddel_withbuttons.h"
 
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <libglom/connectionpool.h>
 #include <libglom/appstate.h>
 #include <glom/base_db.h>

Modified: trunk/glom/combobox_fields.h
==============================================================================
--- trunk/glom/combobox_fields.h	(original)
+++ trunk/glom/combobox_fields.h	Tue Mar 31 09:09:18 2009
@@ -24,7 +24,7 @@
 #include <gtkmm/combobox.h>
 #include <gtkmm/builder.h>
 #include <libglom/data_structure/field.h>
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <libglom/sharedptr.h>
 
 #include <gtkmm/treestore.h>

Modified: trunk/glom/combobox_relationship.h
==============================================================================
--- trunk/glom/combobox_relationship.h	(original)
+++ trunk/glom/combobox_relationship.h	Tue Mar 31 09:09:18 2009
@@ -24,7 +24,7 @@
 #include <gtkmm/combobox.h>
 #include <gtkmm/builder.h>
 #include <libglom/data_structure/relationship.h>
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <libglom/sharedptr.h>
 
 #include <gtkmm/treestore.h>

Modified: trunk/glom/filechooser_export.h
==============================================================================
--- trunk/glom/filechooser_export.h	(original)
+++ trunk/glom/filechooser_export.h	Tue Mar 31 09:09:18 2009
@@ -21,7 +21,7 @@
 #ifndef FILECHOOSER_EXPORT_GLOM_H
 #define FILECHOOSER_EXPORT_GLOM_H
 
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <gtkmm/filechooserdialog.h>
 
 namespace Glom

Modified: trunk/glom/frame_glom.h
==============================================================================
--- trunk/glom/frame_glom.h	(original)
+++ trunk/glom/frame_glom.h	Tue Mar 31 09:09:18 2009
@@ -25,7 +25,7 @@
 
 #include <gtkmm/frame.h>
 #include <libglom/document/bakery/view/view_composite.h>
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 
 #include "dialog_glom.h"
 #include "navigation/box_tables.h"

Modified: trunk/glom/glom_postgres.h
==============================================================================
--- trunk/glom/glom_postgres.h	(original)
+++ trunk/glom/glom_postgres.h	Tue Mar 31 09:09:18 2009
@@ -24,7 +24,7 @@
 #include <gtkmm.h>
 
 #include <glom/base_db.h>
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <libglom/connectionpool.h>
 
 namespace Glom

Modified: trunk/glom/layout_item_dialogs/box_formatting.h
==============================================================================
--- trunk/glom/layout_item_dialogs/box_formatting.h	(original)
+++ trunk/glom/layout_item_dialogs/box_formatting.h	Tue Mar 31 09:09:18 2009
@@ -23,7 +23,7 @@
 
 #include <gtkmm.h>
 #include "../utility_widgets/dialog_properties.h"
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include "../box_withbuttons.h"
 #include "../utility_widgets/comboentry_currency.h"
 #include "../combobox_relationship.h"

Modified: trunk/glom/layout_item_dialogs/dialog_field_summary.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_field_summary.h	(original)
+++ trunk/glom/layout_item_dialogs/dialog_field_summary.h	Tue Mar 31 09:09:18 2009
@@ -23,7 +23,7 @@
 
 #include <gtkmm.h>
 #include "../utility_widgets/dialog_properties.h"
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
 #include "../box_withbuttons.h"
 #include "../utility_widgets/combo_textglade.h"

Modified: trunk/glom/layout_item_dialogs/dialog_group_by.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_group_by.h	(original)
+++ trunk/glom/layout_item_dialogs/dialog_group_by.h	Tue Mar 31 09:09:18 2009
@@ -23,7 +23,7 @@
 
 #include <gtkmm.h>
 #include "../utility_widgets/dialog_properties.h"
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include "../box_withbuttons.h"
 #include "../utility_widgets/combo_textglade.h"
 #include "../utility_widgets/comboentry_currency.h"

Modified: trunk/glom/libglom/connectionpool.cc
==============================================================================
--- trunk/glom/libglom/connectionpool.cc	(original)
+++ trunk/glom/libglom/connectionpool.cc	Tue Mar 31 09:09:18 2009
@@ -21,7 +21,7 @@
 #include <libglom/libglom_config.h> // For GLOM_ENABLE_MAEMO
  
 #include <libglom/connectionpool.h>
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <libglom/utils.h>
 //#include <libgdamm/connectionevent.h>
 #include <glibmm/i18n.h>

Modified: trunk/glom/libglom/data_structure/iso_codes.cc
==============================================================================
--- trunk/glom/libglom/data_structure/iso_codes.cc	(original)
+++ trunk/glom/libglom/data_structure/iso_codes.cc	Tue Mar 31 09:09:18 2009
@@ -22,7 +22,7 @@
 
 #include "iso_codes.h"
 #include <libxml++/libxml++.h>
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <libglom/utils.h>
 #include <glibmm/i18n.h>
 

Modified: trunk/glom/libglom/document/Makefile.am
==============================================================================
--- trunk/glom/libglom/document/Makefile.am	(original)
+++ trunk/glom/libglom/document/Makefile.am	Tue Mar 31 09:09:18 2009
@@ -2,8 +2,8 @@
 
 AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(LIBGLOM_CFLAGS) $(GLOM_WARNING_FLAGS)
 
-h_sources = document_glom.h view.h
-cc_sources = document_glom.cc
+h_sources = document.h view.h
+cc_sources = document.cc
 
 library_includedir=$(includedir)/glom-1.0/libglom/document
 library_include_HEADERS = $(h_sources)

Copied: trunk/glom/libglom/document/document.cc (from r2039, /trunk/glom/libglom/document/document_glom.cc)
==============================================================================
--- /trunk/glom/libglom/document/document_glom.cc	(original)
+++ trunk/glom/libglom/document/document.cc	Tue Mar 31 09:09:18 2009
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <libglom/utils.h>
 //#include <libglom/data_structure/glomconversions.h>
 #include <libglom/data_structure/layout/report_parts/layoutitem_summary.h>

Modified: trunk/glom/libglom/document/view.h
==============================================================================
--- trunk/glom/libglom/document/view.h	(original)
+++ trunk/glom/libglom/document/view.h	Tue Mar 31 09:09:18 2009
@@ -21,7 +21,7 @@
 #ifndef DOCUMENT_GLOM_VIEW_H
 #define DOCUMENT_GLOM_VIEW_H
 
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <libglom/document/bakery/view/view_composite.h>
 
 namespace Glom

Modified: trunk/glom/libglom/python_embed/py_glom_record.h
==============================================================================
--- trunk/glom/libglom/python_embed/py_glom_record.h	(original)
+++ trunk/glom/libglom/python_embed/py_glom_record.h	Tue Mar 31 09:09:18 2009
@@ -26,7 +26,7 @@
 
 #include <Python.h>
 
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <libglom/data_structure/field.h>
 #include <glibmm/ustring.h>
 

Modified: trunk/glom/libglom/python_embed/py_glom_relatedrecord.h
==============================================================================
--- trunk/glom/libglom/python_embed/py_glom_relatedrecord.h	(original)
+++ trunk/glom/libglom/python_embed/py_glom_relatedrecord.h	Tue Mar 31 09:09:18 2009
@@ -24,7 +24,7 @@
 #define NO_IMPORT_PYGTK //To avoid a multiple definition in pygtk.
 #include <pygtk/pygtk.h> //For the PyGObject and PyGBoxed struct definitions.
 
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <libglom/data_structure/field.h>
 #include <glibmm/ustring.h>
 

Modified: trunk/glom/libglom/test_document.cc
==============================================================================
--- trunk/glom/libglom/test_document.cc	(original)
+++ trunk/glom/libglom/test_document.cc	Tue Mar 31 09:09:18 2009
@@ -21,7 +21,7 @@
 // Compile this like so:
 // g++ test_document.cc `pkg-config glom-1.0 --libs --cflags`
 
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <libglom/init.h>
 
 void print_layout_group(const Glom::sharedptr<Glom::LayoutGroup>& layout_group, const Glib::ustring& indent)

Modified: trunk/glom/mode_data/dialog_choose_field.h
==============================================================================
--- trunk/glom/mode_data/dialog_choose_field.h	(original)
+++ trunk/glom/mode_data/dialog_choose_field.h	Tue Mar 31 09:09:18 2009
@@ -23,7 +23,7 @@
 
 #include <gtkmm.h>
 #include "../utility_widgets/dialog_properties.h"
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include "../box_withbuttons.h"
 #include "../utility_widgets/combo_textglade.h"
 #include "../combobox_relationship.h"

Modified: trunk/glom/mode_data/dialog_choose_relationship.h
==============================================================================
--- trunk/glom/mode_data/dialog_choose_relationship.h	(original)
+++ trunk/glom/mode_data/dialog_choose_relationship.h	Tue Mar 31 09:09:18 2009
@@ -23,7 +23,7 @@
 
 #include <gtkmm/dialog.h>
 #include "../utility_widgets/dialog_properties.h"
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include "../box_withbuttons.h"
 
 namespace Glom

Modified: trunk/glom/mode_data/dialog_layout.h
==============================================================================
--- trunk/glom/mode_data/dialog_layout.h	(original)
+++ trunk/glom/mode_data/dialog_layout.h	Tue Mar 31 09:09:18 2009
@@ -23,7 +23,7 @@
 
 #include <gtkmm/dialog.h>
 #include "../utility_widgets/dialog_properties.h"
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include "../box_withbuttons.h"
 
 namespace Glom

Modified: trunk/glom/mode_data/flowtablewithfields.h
==============================================================================
--- trunk/glom/mode_data/flowtablewithfields.h	(original)
+++ trunk/glom/mode_data/flowtablewithfields.h	Tue Mar 31 09:09:18 2009
@@ -37,7 +37,7 @@
 #include <libglom/data_structure/layout/layoutitem_text.h>
 #include <libglom/data_structure/layout/layoutitem_placeholder.h>
 #include <libglom/data_structure/field.h>
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <glom/utility_widgets/layoutwidgetbase.h>
 #include <glom/utility_widgets/layoutwidgetutils.h>
 #include <glom/mode_data/box_data_list_related.h>

Modified: trunk/glom/mode_design/print_layouts/dialog_text_formatting.h
==============================================================================
--- trunk/glom/mode_design/print_layouts/dialog_text_formatting.h	(original)
+++ trunk/glom/mode_design/print_layouts/dialog_text_formatting.h	Tue Mar 31 09:09:18 2009
@@ -23,7 +23,7 @@
 
 #include <gtkmm.h>
 #include <gtkmm/builder.h>
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <glom/layout_item_dialogs/box_formatting.h>
 
 namespace Glom

Modified: trunk/glom/mode_design/print_layouts/window_print_layout_edit.h
==============================================================================
--- trunk/glom/mode_design/print_layouts/window_print_layout_edit.h	(original)
+++ trunk/glom/mode_design/print_layouts/window_print_layout_edit.h	Tue Mar 31 09:09:18 2009
@@ -25,7 +25,7 @@
 #include <glom/mode_design/print_layouts/canvas_print_layout.h>
 #include <glom/mode_design/print_layouts/print_layout_toolbar.h>
 #include <glom/mode_design/print_layouts/print_layout_toolbar_button.h>
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <gtkmm/window.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/label.h>

Modified: trunk/glom/notebook_glom.h
==============================================================================
--- trunk/glom/notebook_glom.h	(original)
+++ trunk/glom/notebook_glom.h	Tue Mar 31 09:09:18 2009
@@ -22,7 +22,7 @@
 #define NOTEBOOK_GLOM_H
 
 #include "box_withbuttons.h"
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 
 namespace Glom
 {

Modified: trunk/glom/relationships_overview/canvas_group_dbtable.h
==============================================================================
--- trunk/glom/relationships_overview/canvas_group_dbtable.h	(original)
+++ trunk/glom/relationships_overview/canvas_group_dbtable.h	Tue Mar 31 09:09:18 2009
@@ -23,7 +23,7 @@
 
 #include "glom/utility_widgets/canvas/canvas_group_movable.h"
 #include <goocanvasmm/polyline.h>
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 
 namespace Glom
 {

Modified: trunk/glom/translation/dialog_copy_translation.h
==============================================================================
--- trunk/glom/translation/dialog_copy_translation.h	(original)
+++ trunk/glom/translation/dialog_copy_translation.h	Tue Mar 31 09:09:18 2009
@@ -22,7 +22,7 @@
 #define GLOM_TRANSLATIONS_DIALOG_COPY_TRANSLATION_H
 
 #include "combobox_locale.h"
-#include <libglom/document/document_glom.h> // For View_Composite_Glom
+#include <libglom/document/document.h> // For View_Composite_Glom
 #include <gtkmm/builder.h>
 #include <gtkmm/dialog.h>
 

Modified: trunk/glom/utility_widgets/db_adddel/db_adddel.h
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/db_adddel.h	(original)
+++ trunk/glom/utility_widgets/db_adddel/db_adddel.h	Tue Mar 31 09:09:18 2009
@@ -25,7 +25,7 @@
 #include <libglom/data_structure/layout/layoutitem_field.h>
 #include <libgdamm.h>
 #include "glom_db_treemodel.h"
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include <glom/base_db_table_data.h>
 
 #include <vector>

Modified: trunk/glom/utility_widgets/dialog_choose_date.h
==============================================================================
--- trunk/glom/utility_widgets/dialog_choose_date.h	(original)
+++ trunk/glom/utility_widgets/dialog_choose_date.h	Tue Mar 31 09:09:18 2009
@@ -22,7 +22,7 @@
 #define GLOM_MODE_DATA_DIALOG_CHOOSE_DATE_H
 
 #include <gtkmm/dialog.h>
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include "../base_db.h"
 #include "../mode_find/box_data_details_find.h"
 #include "../mode_data/box_data_list.h"

Modified: trunk/glom/utility_widgets/dialog_choose_id.h
==============================================================================
--- trunk/glom/utility_widgets/dialog_choose_id.h	(original)
+++ trunk/glom/utility_widgets/dialog_choose_id.h	Tue Mar 31 09:09:18 2009
@@ -22,7 +22,7 @@
 #define GLOM_MODE_DATA_DIALOG_CHOOSE_ID_H
 
 #include <gtkmm/dialog.h>
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 #include "../base_db.h"
 #include "../mode_find/box_data_details_find.h"
 #include "../mode_data/box_data_list.h"

Modified: trunk/glom/utility_widgets/filechooserdialog_saveextras.h
==============================================================================
--- trunk/glom/utility_widgets/filechooserdialog_saveextras.h	(original)
+++ trunk/glom/utility_widgets/filechooserdialog_saveextras.h	Tue Mar 31 09:09:18 2009
@@ -23,7 +23,7 @@
 
 #include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY, GLOM_ENABLE_SQLITE
 
-#include <libglom/document/document_glom.h>
+#include <libglom/document/document.h>
 
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/label.h>