glom r2022 - in trunk: . glom glom/libglom/document/bakery

[murrayc svn gnome org]

Author: murrayc
Date: Tue Mar 24 02:09:50 2009
New Revision: 2022
URL: http://svn.gnome.org/viewvc/glom?rev=2022&view=rev

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

* glom/libglom/document/bakery/Document.h: Removed more unnecessary 
virtuals.

Modified:
   trunk/ChangeLog
   trunk/glom/application.cc
   trunk/glom/libglom/document/bakery/Document.h

Modified: trunk/glom/application.cc
==============================================================================
--- trunk/glom/application.cc	(original)
+++ trunk/glom/application.cc	Tue Mar 24 02:09:50 2009
@@ -902,6 +902,7 @@
         // adding the URI to the recently used files in document_history_add.
         // We want to add the document that is created from the example
         // instead of the example itself.
+        // TODO: This is a weird hack. Find a nicer way. murrayc.
         m_example_uri = pDocument->get_file_uri();
 
         pDocument->set_file_uri(Glib::ustring()); //Prevent it from defaulting to the read-only examples directory when offering saveas.

Modified: trunk/glom/libglom/document/bakery/Document.h
==============================================================================
--- trunk/glom/libglom/document/bakery/Document.h	(original)
+++ trunk/glom/libglom/document/bakery/Document.h	Tue Mar 24 02:09:50 2009
@@ -58,35 +58,35 @@
   bool load_from_data(const guchar* data, std::size_t length);
 
 
-  virtual bool get_modified() const;
+  bool get_modified() const;
   virtual void set_modified(bool bVal = true);
 
   ///Whether this just a default document.
-  virtual bool get_is_new() const;
+  bool get_is_new() const;
   ///Called by App_WithDoc::init_create_document().
   void set_is_new(bool bVal);
 
-  virtual Glib::ustring get_contents() const;
-  virtual void set_contents(const Glib::ustring& strVal);
+  Glib::ustring get_contents() const;
+  void set_contents(const Glib::ustring& strVal);
 
-  virtual Glib::ustring get_file_uri_with_extension(const Glib::ustring& uri);
+  Glib::ustring get_file_uri_with_extension(const Glib::ustring& uri);
 
-  virtual Glib::ustring get_file_uri() const;
+  Glib::ustring get_file_uri() const;
   virtual void set_file_uri(const Glib::ustring& file_uri, bool bEnforceFileExtension = false);
 
   ///Gets filename part of file_uri, or 'untitled'.
   virtual Glib::ustring get_name() const;
   static Glib::ustring util_file_uri_get_name(const Glib::ustring& file_uri, const Glib::ustring& file_extension);
 
-  virtual bool get_read_only() const;
-  virtual void set_read_only(bool bVal);
+  bool get_read_only() const;
+  void set_read_only(bool bVal);
 
   ///If you don't want to use a View, then don't use set_view().
-  virtual void set_view(ViewBase* pView);
-  virtual ViewBase* get_view();
+  void set_view(ViewBase* pView);
+  ViewBase* get_view();
 
-  virtual void set_file_extension(const Glib::ustring& strVal);
-  virtual Glib::ustring get_file_extension() const;
+  void set_file_extension(const Glib::ustring& strVal);
+  Glib::ustring get_file_extension() const;
 
   //Signals
   /** For instance, void on_document_modified(bool modified);
@@ -118,8 +118,8 @@
    */
   virtual bool save_before();
 
-  virtual bool read_from_disk();
-  virtual bool write_to_disk();
+  bool read_from_disk();
+  bool write_to_disk();
 
   Glib::ustring m_strContents;
   Glib::ustring m_file_uri;