glom r2005 - in trunk: . glom/bakery glom/libglom glom/libglom/document/bakery glom/libglom/document/bakery/view glom/mode_data po

From: murrayc svn gnome org
To: svn-commits-list gnome org
Subject: glom r2005 - in trunk: . glom/bakery glom/libglom glom/libglom/document/bakery glom/libglom/document/bakery/view glom/mode_data po
Date: Thu, 19 Mar 2009 10:22:41 +0000 (UTC)
Author: murrayc
Date: Thu Mar 19 10:22:41 2009
New Revision: 2005
URL: http://svn.gnome.org/viewvc/glom?rev=2005&view=rev

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

* glom/bakery/*.[h|cc]: Fixed compiler warnings. Used GLOM defines 
instead of BAKERY defines.
* po/POTFILES.in: Added the bakery files.

Modified:
   trunk/ChangeLog
   trunk/glom/bakery/App.h
   trunk/glom/bakery/AppInstanceManager.h
   trunk/glom/bakery/App_Gtk.cc
   trunk/glom/bakery/App_Gtk.h
   trunk/glom/bakery/App_WithDoc.cc
   trunk/glom/bakery/App_WithDoc.h
   trunk/glom/bakery/App_WithDoc_Gtk.cc
   trunk/glom/bakery/App_WithDoc_Gtk.h
   trunk/glom/bakery/Dialog_OfferSave.cc
   trunk/glom/bakery/Dialog_OfferSave.h
   trunk/glom/bakery/GtkDialogs.cc
   trunk/glom/bakery/GtkDialogs.h
   trunk/glom/libglom/busy_cursor.h
   trunk/glom/libglom/document/bakery/Document.cc
   trunk/glom/libglom/document/bakery/Document.h
   trunk/glom/libglom/document/bakery/Document_XML.cc
   trunk/glom/libglom/document/bakery/Document_XML.h
   trunk/glom/libglom/document/bakery/view/View.h
   trunk/glom/libglom/document/bakery/view/ViewBase.h
   trunk/glom/libglom/document/bakery/view/View_Composite.h
   trunk/glom/mode_data/box_data.cc
   trunk/glom/mode_data/box_data_details.cc
   trunk/po/POTFILES.in

Modified: trunk/glom/bakery/App.h
==============================================================================
--- trunk/glom/bakery/App.h	(original)
+++ trunk/glom/bakery/App.h	Thu Mar 19 10:22:41 2009
@@ -16,8 +16,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef BAKERY_APP_H
-#define BAKERY_APP_H
+#ifndef GLOM_BAKERY_APP_H
+#define GLOM_BAKERY_APP_H
 
 #include <glom/bakery/AppInstanceManager.h>
 #include <glibmm/object.h>

Modified: trunk/glom/bakery/AppInstanceManager.h
==============================================================================
--- trunk/glom/bakery/AppInstanceManager.h	(original)
+++ trunk/glom/bakery/AppInstanceManager.h	Thu Mar 19 10:22:41 2009
@@ -16,8 +16,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef BAKERY_APPINSTANCEMANAGER_H
-#define BAKERY_APPINSTANCEMANAGER_H
+#ifndef GLOM_BAKERY_APPINSTANCEMANAGER_H
+#define GLOM_BAKERY_APPINSTANCEMANAGER_H
 
 #include <sigc++/sigc++.h>
 #include <list>

Modified: trunk/glom/bakery/App_Gtk.cc
==============================================================================
--- trunk/glom/bakery/App_Gtk.cc	(original)
+++ trunk/glom/bakery/App_Gtk.cc	Thu Mar 19 10:22:41 2009
@@ -110,7 +110,7 @@
 
   //Add menu bar at the top:
   //These were defined in init_uimanager().
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
   Gtk::Menu* pMenu = static_cast<Gtk::Menu*>(m_refUIManager->get_widget("/Bakery_MainMenu"));
   set_menu(*pMenu);
 #else
@@ -121,7 +121,7 @@
   Gtk::Toolbar* pToolBar = static_cast<Gtk::Toolbar*>(m_refUIManager->get_widget("/Bakery_ToolBar"));
   if(pToolBar)
   {
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
     add_toolbar(*pToolBar);
 #else
     m_HandleBox_Toolbar.add(*pToolBar);
@@ -176,7 +176,7 @@
   //by adding a us string with one of the placeholders, but with menu items underneath it.
   static const Glib::ustring ui_description =
     "<ui>"
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
     "  <popup name='Bakery_MainMenu'>"
 #else
     "  <menubar name='Bakery_MainMenu'>"
@@ -185,7 +185,7 @@
     "    <placeholder name='Bakery_MenuPH_Edit' />"
     "    <placeholder name='Bakery_MenuPH_Others' />" //Note that extra menus should be inserted before the Help menu, which should always be at the end.
     "    <placeholder name='Bakery_MenuPH_Help' />"
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
     "  </popup>"
 #else
     "  </menubar>"
@@ -257,7 +257,7 @@
   //Build part of the menu structure, to be merged in by using the "PH" placeholders:
   static const Glib::ustring ui_description =
     "<ui>"
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
     "  <popup name='Bakery_MainMenu'>"
 #else
     "  <menubar name='Bakery_MainMenu'>"
@@ -269,7 +269,7 @@
     "        <menuitem action='BakeryAction_File_Exit' />"
     "      </menu>"
     "    </placeholder>"
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
     "  </popup>"
 #else
     "  </menubar>"
@@ -299,7 +299,7 @@
   //Build part of the menu structure, to be merged in by using the "PH" placeholders:
   static const Glib::ustring ui_description =
     "<ui>"
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
     "  <popup name='Bakery_MainMenu'>"
 #else
     "  <menubar name='Bakery_MainMenu'>"
@@ -312,7 +312,7 @@
     "        <menuitem action='BakeryAction_Edit_Clear' />"
     "      </menu>"
     "    </placeholder>"
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
     "  </popup>"
 #else
     "  </menubar>"
@@ -342,7 +342,7 @@
   //Build part of the menu structure, to be merged in by using the "PH" plaeholders:
   static const Glib::ustring ui_description =
     "<ui>"
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
     "  <popup name='Bakery_MainMenu'>"
 #else
     "  <menubar name='Bakery_MainMenu'>"
@@ -352,7 +352,7 @@
     "        <menuitem action='BakeryAction_Help_About' />"
     "      </menu>"
     "    </placeholder>"
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
     "  </popup>"
 #else
     "  </menubar>"

Modified: trunk/glom/bakery/App_Gtk.h
==============================================================================
--- trunk/glom/bakery/App_Gtk.h	(original)
+++ trunk/glom/bakery/App_Gtk.h	Thu Mar 19 10:22:41 2009
@@ -16,13 +16,13 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef BAKERY_APP_GTK_H
-#define BAKERY_APP_GTK_H
+#ifndef GLOM_BAKERY_APP_GTK_H
+#define GLOM_BAKERY_APP_GTK_H
 
-#include <config.h> // For BAKERY_MAEMO_ENABLED
+#include <config.h> // For GLOM_ENABLE_MAEMO
 #include <glom/bakery/App.h>
 
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
 #include <hildonmm/window.h>
 #endif
 
@@ -45,14 +45,14 @@
  */
 class App_Gtk
   : virtual public App, //virtual because App_WithDoc_Gtk will inherit it via App_Gtk and via App_With_Doc
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
     virtual public Hildon::Window //inherit virtually to share sigc::trackable.
 #else
     virtual public Gtk::Window //inherit virtually to share sigc::trackable.
 #endif
 {
 public:
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
   typedef Hildon::Window ParentWindow;
 #else
   typedef Gtk::Window ParentWindow;

Modified: trunk/glom/bakery/App_WithDoc.cc
==============================================================================
--- trunk/glom/bakery/App_WithDoc.cc	(original)
+++ trunk/glom/bakery/App_WithDoc.cc	Thu Mar 19 10:22:41 2009
@@ -24,10 +24,6 @@
 #include <algorithm>
 #include <glibmm/i18n-lib.h>
 
-//#include <gtk/gtkfilesel.h>
-
-#define BAKERY_GCONF_DIRECTORY_RECENTFILES "recent_files"
-
 namespace GlomBakery
 {
 
@@ -470,7 +466,7 @@
 
 }
 
-void App_WithDoc::on_document_modified(bool modified)
+void App_WithDoc::on_document_modified(bool /* modified */)
 {
   //Change the displayed 'modified' status.
   //This method could be overridden to e.g. enable a Save icon or enable the Save menu item.
@@ -525,12 +521,12 @@
 }
 
 
-void App_WithDoc::document_history_add(const Glib::ustring& file_uri)
+void App_WithDoc::document_history_add(const Glib::ustring& /* file_uri */)
 {
   //Override this.
 }
 
-void App_WithDoc::document_history_remove(const Glib::ustring& file_uri)
+void App_WithDoc::document_history_remove(const Glib::ustring& /* file_uri */)
 {
   //Override this.
 }

Modified: trunk/glom/bakery/App_WithDoc.h
==============================================================================
--- trunk/glom/bakery/App_WithDoc.h	(original)
+++ trunk/glom/bakery/App_WithDoc.h	Thu Mar 19 10:22:41 2009
@@ -16,8 +16,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef BAKERY_APP_WITHDOC_H
-#define BAKERY_APP_WITHDOC_H
+#ifndef GLOM_BAKERY_APP_WITHDOC_H
+#define GLOM_BAKERY_APP_WITHDOC_H
 
 #include <glom/bakery/App.h>
 #include <libglom/document/bakery/Document.h>

Modified: trunk/glom/bakery/App_WithDoc_Gtk.cc
==============================================================================
--- trunk/glom/bakery/App_WithDoc_Gtk.cc	(original)
+++ trunk/glom/bakery/App_WithDoc_Gtk.cc	Thu Mar 19 10:22:41 2009
@@ -47,9 +47,9 @@
 
 /// This constructor can be used with Gtk::Builder::get_derived_widget().
 App_WithDoc_Gtk::App_WithDoc_Gtk(BaseObjectType* cobject, const Glib::ustring& appname)
-: App_WithDoc(appname),
-  App_Gtk(cobject, appname),
-  ParentWindow(cobject) //This is a virtual base class (not a direct base), so we must specify a constructor or the default constructor will be called, regardless of what the App_Gtk(cobject) constructor does. Derived classes must do this as well.
+: ParentWindow(cobject), //This is a virtual base class (not a direct base), so we must specify a constructor or the default constructor will be called, regardless of what the App_Gtk(cobject) constructor does. Derived classes must do this as well.
+  App_WithDoc(appname),
+  App_Gtk(cobject, appname)
 {
   //TODO: appname.
 }
@@ -175,7 +175,7 @@
   //Build part of the menu structure, to be merged in by using the "PH" placeholders:
   static const Glib::ustring ui_description =
     "<ui>"
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
     "  <popup name='Bakery_MainMenu'>"
 #else
     "  <menubar name='Bakery_MainMenu'>"
@@ -193,7 +193,7 @@
     "        <menuitem action='BakeryAction_File_Exit' />"
     "      </menu>"
     "    </placeholder>"
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
     "  </popup>"
 #else
     "  </menubar>"
@@ -275,11 +275,10 @@
   if(!file_exists(file_uri))
     return;
 
-#ifdef GTKMM_GEQ_2_10
   {
     //TODO: Wrap gnome_vfs_escape_path_string() in gnome-vfsmm.
     //Glib::ustring filename_e = Gnome::Vfs::escape_path_string(file_uri);
-    Glib::ustring uri = file_uri; // "file://" + filename_e;
+    const Glib::ustring uri = file_uri; // "file://" + filename_e;
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
     Gtk::RecentManager::get_default()->add_item(uri);
@@ -289,16 +288,14 @@
     // Ignore error
 #endif
   }
-#endif // GTKMM_GEQ_2_10
 }
 
 void App_WithDoc_Gtk::document_history_remove(const Glib::ustring& file_uri)
 {
-#ifdef GTKMM_GEQ_2_10
   if(!file_uri.empty())
   {
     //Glib::ustring filename_e = Gnome::Vfs::escape_path_string(file_uri.c_str());
-    Glib::ustring uri = file_uri; //"file://" + filename_e;
+    const Glib::ustring uri = file_uri; //"file://" + filename_e;
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
     Gtk::RecentManager::get_default()->remove_item(uri);
@@ -308,17 +305,14 @@
     // Ignore error
 #endif
   }
-#endif // GTKMM_GEQ_2_10
 }
 
 void App_WithDoc_Gtk::on_recent_files_activate(Gtk::RecentChooser& chooser)
 {
-#ifdef GTKMM_GEQ_2_10
-  Glib::ustring uri = chooser.get_current_uri();
-  bool bTest = open_document(uri);
+  const Glib::ustring uri = chooser.get_current_uri();
+  const bool bTest = open_document(uri);
   if(!bTest)
     document_history_remove(uri);
-#endif // GTKMM_GEQ_2_10
 }
 
 } //namespace

Modified: trunk/glom/bakery/App_WithDoc_Gtk.h
==============================================================================
--- trunk/glom/bakery/App_WithDoc_Gtk.h	(original)
+++ trunk/glom/bakery/App_WithDoc_Gtk.h	Thu Mar 19 10:22:41 2009
@@ -16,8 +16,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef BAKERY_APP_WITHDOC_GTK_H
-#define BAKERY_APP_WITHDOC_GTK_H
+#ifndef GLOM_BAKERY_APP_WITHDOC_GTK_H
+#define GLOM_BAKERY_APP_WITHDOC_GTK_H
 
 #include <glom/bakery/App_WithDoc.h>
 #include <glom/bakery/App_Gtk.h>

Modified: trunk/glom/bakery/Dialog_OfferSave.cc
==============================================================================
--- trunk/glom/bakery/Dialog_OfferSave.cc	(original)
+++ trunk/glom/bakery/Dialog_OfferSave.cc	Thu Mar 19 10:22:41 2009
@@ -39,7 +39,7 @@
 
 
 Dialog_OfferSave::Dialog_OfferSave(const Glib::ustring& file_uri)
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
 : Hildon::Note(Hildon::NOTE_TYPE_CONFIRMATION_BUTTON, get_confirmation_message(file_uri))
 #else
 : Gtk::MessageDialog( App_Gtk::util_bold_message(_("Close without Saving")), true /* use markup */, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE)
@@ -47,7 +47,7 @@
 {
   set_title(""); //The HIG says that alert dialogs should not have titles. The default comes from the message type.
 
-#ifndef BAKERY_MAEMO_ENABLED
+#ifndef GLOM_ENABLE_MAEMO
   set_secondary_text(get_confirmation_message(file_uri));
 #endif
 

Modified: trunk/glom/bakery/Dialog_OfferSave.h
==============================================================================
--- trunk/glom/bakery/Dialog_OfferSave.h	(original)
+++ trunk/glom/bakery/Dialog_OfferSave.h	Thu Mar 19 10:22:41 2009
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
 #include <hildonmm/note.h>
 #else
 #include <gtkmm/messagedialog.h>
@@ -30,7 +30,7 @@
 namespace GlomBakery
 {
 
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
 class Dialog_OfferSave : public Hildon::Note
 #else
 class Dialog_OfferSave : public Gtk::MessageDialog

Modified: trunk/glom/bakery/GtkDialogs.cc
==============================================================================
--- trunk/glom/bakery/GtkDialogs.cc	(original)
+++ trunk/glom/bakery/GtkDialogs.cc	Thu Mar 19 10:22:41 2009
@@ -18,10 +18,10 @@
 
 #include <config.h>
 
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
 #include <hildon-fmmm/file-chooser-dialog.h>
 #include <hildonmm/note.h>
-#endif // BAKERY_MAEMO_ENABLED
+#endif // GLOM_ENABLE_MAEMO
 
 #include <glom/bakery/GtkDialogs.h>
 #include <glom/bakery/Dialog_OfferSave.h>
@@ -40,7 +40,7 @@
 {
   Gtk::Window* pWindow = dynamic_cast<Gtk::Window*>(&app);
 
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
   Hildon::Note dialog(Hildon::NOTE_TYPE_INFORMATION, text, Gtk::Stock::DIALOG_WARNING);
 #else
   Gtk::MessageDialog dialog(App_Gtk::util_bold_message(text), true /* use markup */, Gtk::MESSAGE_WARNING);
@@ -59,14 +59,14 @@
 {
   Gtk::Window* pWindow = dynamic_cast<Gtk::Window*>(&app);
 
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
   Hildon::FileChooserDialog fileChooser_Open(Gtk::FILE_CHOOSER_ACTION_OPEN);
 #else
   Gtk::FileChooserDialog fileChooser_Open(_("Open Document"), Gtk::FILE_CHOOSER_ACTION_OPEN);
   fileChooser_Open.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
   fileChooser_Open.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
   fileChooser_Open.set_default_response(Gtk::RESPONSE_OK);
-#endif // BAKERY_MAEMO_ENABLED
+#endif // GLOM_ENABLE_MAEMO
 
   if(pWindow)
     fileChooser_Open.set_transient_for(*pWindow);
@@ -119,14 +119,14 @@
 {
   Gtk::Window* pWindow = dynamic_cast<Gtk::Window*>(&app);
 
-#ifdef BAKERY_MAEMO_ENABLED
+#ifdef GLOM_ENABLE_MAEMO
   Hildon::FileChooserDialog fileChooser_Save(Gtk::FILE_CHOOSER_ACTION_SAVE);
 #else
   Gtk::FileChooserDialog fileChooser_Save(_("Save Document"), Gtk::FILE_CHOOSER_ACTION_SAVE);
   fileChooser_Save.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
   fileChooser_Save.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_OK);
   fileChooser_Save.set_default_response(Gtk::RESPONSE_OK);
-#endif // BAKERY_MAEMO_ENABLED
+#endif // GLOM_ENABLE_MAEMO
 
  if(pWindow)
     fileChooser_Save.set_transient_for(*pWindow);
@@ -211,6 +211,8 @@
     else
       return Glib::ustring(); //The user cancelled.
   }
+
+  return Glib::ustring();
 }
 
 App_WithDoc::enumSaveChanges GtkDialogs::ui_offer_to_save_changes(App& app, const Glib::ustring& file_uri)

Modified: trunk/glom/bakery/GtkDialogs.h
==============================================================================
--- trunk/glom/bakery/GtkDialogs.h	(original)
+++ trunk/glom/bakery/GtkDialogs.h	Thu Mar 19 10:22:41 2009
@@ -16,8 +16,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef BAKERY_APP_GTKDIALOGS_H
-#define BAKERY_APP_GTKDIALOGS_H
+#ifndef GLOM_BAKERY_APP_GTKDIALOGS_H
+#define GLOM_BAKERY_APP_GTKDIALOGS_H
 
 #include <glom/bakery/App_WithDoc.h>
 

Modified: trunk/glom/libglom/busy_cursor.h
==============================================================================
--- trunk/glom/libglom/busy_cursor.h	(original)
+++ trunk/glom/libglom/busy_cursor.h	Thu Mar 19 10:22:41 2009
@@ -16,8 +16,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef BAKERY_UTILITIES_BUSYCURSOR_H
-#define BAKERY_UTILITIES_BUSYCURSOR_H
+#ifndef GLOM_BAKERY_UTILITIES_BUSYCURSOR_H
+#define GLOM_BAKERY_UTILITIES_BUSYCURSOR_H
 
 #include <gtkmm/window.h>
 #include <gdkmm/cursor.h>

Modified: trunk/glom/libglom/document/bakery/Document.cc
==============================================================================
--- trunk/glom/libglom/document/bakery/Document.cc	(original)
+++ trunk/glom/libglom/document/bakery/Document.cc	Thu Mar 19 10:22:41 2009
@@ -304,7 +304,7 @@
     try
     {
       //Write the data to the output uri
-      const gsize bytes_written = stream->write(m_strContents.data(), m_strContents.bytes());
+      stream->write(m_strContents.data(), m_strContents.bytes());
 
       //Close the stream to make sure that the write really happens 
       //even with glibmm 2.16.0 which had a refcount leak that stopped it.
@@ -314,7 +314,7 @@
     catch(const Gio::Error& ex)
     {
 #else
-    const gsize bytes_written = stream->write(m_strContents.data(), m_strContents.bytes(), error);
+    stream->write(m_strContents.data(), m_strContents.bytes(), error);
     if(error.get() != NULL)
     {
       Gio::Error& ex = *error.get();

Modified: trunk/glom/libglom/document/bakery/Document.h
==============================================================================
--- trunk/glom/libglom/document/bakery/Document.h	(original)
+++ trunk/glom/libglom/document/bakery/Document.h	Thu Mar 19 10:22:41 2009
@@ -16,8 +16,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef BAKERY_DOCUMENT_H
-#define BAKERY_DOCUMENT_H
+#ifndef GLOM_BAKERY_DOCUMENT_H
+#define GLOM_BAKERY_DOCUMENT_H
 
 #include <glibmm.h>
 #include <libglom/document/bakery/view/ViewBase.h>

Modified: trunk/glom/libglom/document/bakery/Document_XML.cc
==============================================================================
--- trunk/glom/libglom/document/bakery/Document_XML.cc	(original)
+++ trunk/glom/libglom/document/bakery/Document_XML.cc	Thu Mar 19 10:22:41 2009
@@ -85,7 +85,8 @@
   }
 }
 
-bool Document_XML::set_xml(const Glib::ustring& strXML)
+//TODO: Why is this parameter here if it is not used?
+bool Document_XML::set_xml(const Glib::ustring& /* strXML */)
 { 
 #ifdef LIBXMLPP_EXCEPTIONS_ENABLED
   try
@@ -96,7 +97,8 @@
 
     m_DOM_Parser.parse_memory(m_strContents);
     m_pDOM_Document = m_DOM_Parser.get_document();
-    if(!m_pDOM_Document) return false;
+    if(!m_pDOM_Document)
+      return false;
 
     return true;	
   }

Modified: trunk/glom/libglom/document/bakery/Document_XML.h
==============================================================================
--- trunk/glom/libglom/document/bakery/Document_XML.h	(original)
+++ trunk/glom/libglom/document/bakery/Document_XML.h	Thu Mar 19 10:22:41 2009
@@ -16,8 +16,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef BAKERY_DOCUMENT_XML_H
-#define BAKERY_DOCUMENT_XML_H
+#ifndef GLOM_BAKERY_DOCUMENT_XML_H
+#define GLOM_BAKERY_DOCUMENT_XML_H
 
 #include <libglom/document/bakery/Document.h>
 #include <libxml++/libxml++.h>
@@ -90,4 +90,4 @@
 
 } //namespace GlomBakery.
 
-#endif // BAKERY_DOCUMENT_XML_H
+#endif // GLOM_BAKERY_DOCUMENT_XML_H

Modified: trunk/glom/libglom/document/bakery/view/View.h
==============================================================================
--- trunk/glom/libglom/document/bakery/view/View.h	(original)
+++ trunk/glom/libglom/document/bakery/view/View.h	Thu Mar 19 10:22:41 2009
@@ -16,8 +16,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef BAKERY_VIEW_H
-#define BAKERY_VIEW_H
+#ifndef GLOM_BAKERY_VIEW_H
+#define GLOM_BAKERY_VIEW_H
 
 #include <libglom/document/bakery/view/ViewBase.h>
 #include <libglom/document/bakery/Document.h>

Modified: trunk/glom/libglom/document/bakery/view/ViewBase.h
==============================================================================
--- trunk/glom/libglom/document/bakery/view/ViewBase.h	(original)
+++ trunk/glom/libglom/document/bakery/view/ViewBase.h	Thu Mar 19 10:22:41 2009
@@ -16,8 +16,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef BAKERY_VIEWBASE_H
-#define BAKERY_VIEWBASE_H
+#ifndef GLOM_BAKERY_VIEWBASE_H
+#define GLOM_BAKERY_VIEWBASE_H
 
 #include <sigc++/trackable.h>
 

Modified: trunk/glom/libglom/document/bakery/view/View_Composite.h
==============================================================================
--- trunk/glom/libglom/document/bakery/view/View_Composite.h	(original)
+++ trunk/glom/libglom/document/bakery/view/View_Composite.h	Thu Mar 19 10:22:41 2009
@@ -16,8 +16,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef BAKERY_VIEW_COMPOSITE_H
-#define BAKERY_VIEW_COMPOSITE_H
+#ifndef GLOM_BAKERY_VIEW_COMPOSITE_H
+#define GLOM_BAKERY_VIEW_COMPOSITE_H
 
 #include <libglom/document/bakery/view/View.h>
 #include <vector>

Modified: trunk/glom/mode_data/box_data.cc
==============================================================================
--- trunk/glom/mode_data/box_data.cc	(original)
+++ trunk/glom/mode_data/box_data.cc	Thu Mar 19 10:22:41 2009
@@ -25,7 +25,7 @@
 #include <libglom/utils.h>
 #include <libglom/data_structure/layout/layoutitem_field.h>
 #include <glom/glom_privs.h>
-#include "../python_embed/glom_python.h".
+#include "../python_embed/glom_python.h"
 #include <algorithm> //For std::find()
 #include <libglom/libglom_config.h>
 #include <glibmm/i18n.h>

Modified: trunk/glom/mode_data/box_data_details.cc
==============================================================================
--- trunk/glom/mode_data/box_data_details.cc	(original)
+++ trunk/glom/mode_data/box_data_details.cc	Thu Mar 19 10:22:41 2009
@@ -27,7 +27,7 @@
 #include <libglom/glade_utils.h>
 #include <libglom/utils.h>
 #include <glom/glom_privs.h>
-#include "../xsl_utils.h".
+#include "../xsl_utils.h"
 #include "../python_embed/glom_python.h"
 #include <sstream> //For stringstream
 #include <glibmm/i18n.h>

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Thu Mar 19 10:22:41 2009
@@ -18,6 +18,13 @@
 glom/frame_glom.cc
 glom/glom_developer.glade
 glom/glom.glade
+glom/bakery/App.cc
+glom/bakery/AppInstanceManager.cc
+glom/bakery/App_WithDoc_Gtk.cc
+glom/bakery/GtkDialogs.cc
+glom/bakery/App_Gtk.cc
+glom/bakery/App_WithDoc.cc
+glom/bakery/Dialog_OfferSave.cc
 glom/layout_item_dialogs/box_formatting.cc
 glom/layout_item_dialogs/combo_summarytype.cc
 glom/layout_item_dialogs/dialog_field_layout.cc
@@ -52,6 +59,11 @@
 glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.cc
 glom/libglom/data_structure/translatable_item.cc
 glom/libglom/document/document_glom.cc
+glom/libglom/document/bakery/Document.cc
+glom/libglom/document/bakery/Document_XML.cc
+glom/libglom/document/bakery/view/ViewBase.cc
+glom/libglom/document/bakery/view/View.cc
+glom/libglom/document/bakery/view/View_Composite.cc
 glom/libglom/gst-package.c
 glom/libglom/spawn_with_feedback.cc
 glom/libglom/utils.cc
@@ -101,7 +113,6 @@
 glom/translation/dialog_change_language.cc
 glom/translation/window_translations.cc
 glom/utility_widgets/adddel/adddel.cc
-glom/utility_widgets/calendar/glomgtkcalendar.c
 glom/utility_widgets/comboentryglom.cc
 glom/utility_widgets/datawidget.cc
 glom/utility_widgets/db_adddel/db_adddel.cc
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]