[lmi-commits] [4891] Merge two headers, renaming 'ihs_dbdict.hpp' to 'dbdict.hpp'

[Greg Chicares]

Revision: 4891
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4891
Author:   chicares
Date:     2010-05-02 03:05:27 +0000 (Sun, 02 May 2010)
Log Message:
-----------
Merge two headers, renaming 'ihs_dbdict.hpp' to 'dbdict.hpp'

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/Makefile.am
    lmi/trunk/database_document.hpp
    lmi/trunk/generate_product_files.cpp
    lmi/trunk/ihs_basicval.cpp
    lmi/trunk/ihs_database.cpp
    lmi/trunk/ihs_dbdict.cpp
    lmi/trunk/main_wx.cpp
    lmi/trunk/my_db.cpp
    lmi/trunk/product_file_test.cpp

Added Paths:
-----------
    lmi/trunk/dbdict.hpp

Removed Paths:
-------------
    lmi/trunk/dbdict.hpp
    lmi/trunk/ihs_dbdict.hpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-05-02 02:29:44 UTC (rev 4890)
+++ lmi/trunk/ChangeLog 2010-05-02 03:05:27 UTC (rev 4891)
@@ -25291,3 +25291,31 @@
   ihs_dbdict.hpp
 Remove some differences between 'ihs_dbdict.hpp' and 'dbdict.hpp'.
 
+20100502T0120Z <address@hidden> [732]
+
+  dbdict.cpp
+  dbdict.hpp
+Remove some differences between 'dbdict.hpp' and 'ihs_dbdict.hpp'.
+
+20100502T0229Z <address@hidden> [732]
+
+  dbdict.hpp
+  ihs_dbdict.cpp
+  ihs_dbdict.hpp
+Make 'dbdict.hpp' equivalent to 'ihs_dbdict.hpp'.
+
+20100502T0305Z <address@hidden> [732]
+
+  Makefile.am
+  database_document.hpp
+  dbdict.hpp     [overwritten by renamed 'ihs_dbdict.hpp']
+  generate_product_files.cpp
+  ihs_basicval.cpp
+  ihs_database.cpp
+  ihs_dbdict.cpp
+  ihs_dbdict.hpp [renamed to 'dbdict.hpp']
+  main_wx.cpp
+  my_db.cpp
+  product_file_test.cpp
+Merge two headers, renaming 'ihs_dbdict.hpp' to 'dbdict.hpp'.
+

Modified: lmi/trunk/Makefile.am
===================================================================
--- lmi/trunk/Makefile.am       2010-05-02 02:29:44 UTC (rev 4890)
+++ lmi/trunk/Makefile.am       2010-05-02 03:05:27 UTC (rev 4891)
@@ -910,7 +910,6 @@
     group_values.hpp \
     handle_exceptions.hpp \
     icon_monger.hpp \
-    ihs_dbdict.hpp \
     ihs_irc7702a.hpp \
     ihs_irc7702.hpp \
     ihs_server7702.hpp \

Modified: lmi/trunk/database_document.hpp
===================================================================
--- lmi/trunk/database_document.hpp     2010-05-02 02:29:44 UTC (rev 4890)
+++ lmi/trunk/database_document.hpp     2010-05-02 03:05:27 UTC (rev 4891)
@@ -28,8 +28,8 @@
 
 #include "product_editor.hpp"
 
+#include "dbdict.hpp"
 #include "dbnames.hpp"
-#include "ihs_dbdict.hpp"
 
 class LMI_SO TDBValue;
 

Deleted: lmi/trunk/dbdict.hpp
===================================================================
--- lmi/trunk/dbdict.hpp        2010-05-02 02:29:44 UTC (rev 4890)
+++ lmi/trunk/dbdict.hpp        2010-05-02 03:05:27 UTC (rev 4891)
@@ -1,81 +0,0 @@
-// Product-database map.
-//
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 
2009, 2010 Gregory W. Chicares.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-//
-// http://savannah.nongnu.org/projects/lmi
-// email: <address@hidden>
-// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-
-// $Id$
-
-#ifndef dbdict_hpp
-#define dbdict_hpp
-
-#include "config.hpp"
-
-#include "dbvalue.hpp" // Needed here for map declaration.
-#include "obstruct_slicing.hpp"
-#include "so_attributes.hpp"
-
-#include <boost/utility.hpp>
-
-#include <map>
-#include <string>
-
-typedef std::map<int, TDBValue> dict_map;
-typedef dict_map::value_type dict_map_val;
-
-class LMI_SO DBDictionary
-    :private boost::noncopyable
-    ,virtual private obstruct_slicing<DBDictionary>
-{
-    friend class DatabaseDocument;
-    friend class product_file_test;
-
-  public:
-    static DBDictionary& instance();
-    ~DBDictionary();
-
-    dict_map const& GetDictionary() const;
-
-    void Init(std::string const& NewFilename);
-    void WriteSampleDBFile();
-    void WriteProprietaryDBFiles();
-
-  private:
-    DBDictionary();
-
-    void WriteDB(std::string const& filename);
-    void Add(TDBValue const&);
-    void BadFile(std::string const& Filename, std::string const& why);
-    void InitDB();
-
-    void InitAntediluvian(); // Antediluvian
-
-    static void InvalidateCache();
-
-    static std::string CachedFilename;
-
-    void AddEntry(dict_map_val const&); // Antediluvian
-
-    dict_map dictionary_;
-    dict_map* dictionary; // Antediluvian
-};
-
-void LMI_SO print_databases();
-
-#endif // dbdict_hpp
-

Copied: lmi/trunk/dbdict.hpp (from rev 4890, lmi/trunk/ihs_dbdict.hpp)
===================================================================
--- lmi/trunk/dbdict.hpp                                (rev 0)
+++ lmi/trunk/dbdict.hpp        2010-05-02 03:05:27 UTC (rev 4891)
@@ -0,0 +1,81 @@
+// Product-database map.
+//
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 
2009, 2010 Gregory W. Chicares.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 2 as
+// published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+//
+// http://savannah.nongnu.org/projects/lmi
+// email: <address@hidden>
+// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+
+// $Id$
+
+#ifndef dbdict_hpp
+#define dbdict_hpp
+
+#include "config.hpp"
+
+#include "dbvalue.hpp" // Needed here for map declaration.
+#include "obstruct_slicing.hpp"
+#include "so_attributes.hpp"
+
+#include <boost/utility.hpp>
+
+#include <map>
+#include <string>
+
+typedef std::map<int, TDBValue> dict_map;
+typedef dict_map::value_type dict_map_val;
+
+class LMI_SO DBDictionary
+    :private boost::noncopyable
+    ,virtual private obstruct_slicing<DBDictionary>
+{
+    friend class DatabaseDocument;
+    friend class product_file_test;
+
+  public:
+    static DBDictionary& instance();
+    ~DBDictionary();
+
+    dict_map const& GetDictionary() const;
+
+    void Init(std::string const& NewFilename);
+    void WriteSampleDBFile();
+    void WriteProprietaryDBFiles();
+
+  private:
+    DBDictionary();
+
+    void WriteDB(std::string const& filename);
+    void Add(TDBValue const&);
+    void BadFile(std::string const& Filename, std::string const& why);
+    void InitDB();
+
+    void InitAntediluvian(); // Antediluvian
+
+    static void InvalidateCache();
+
+    static std::string CachedFilename;
+
+    void AddEntry(dict_map_val const&); // Antediluvian
+
+    dict_map dictionary_;
+    dict_map* dictionary; // Antediluvian
+};
+
+void LMI_SO print_databases();
+
+#endif // dbdict_hpp
+

Modified: lmi/trunk/generate_product_files.cpp
===================================================================
--- lmi/trunk/generate_product_files.cpp        2010-05-02 02:29:44 UTC (rev 
4890)
+++ lmi/trunk/generate_product_files.cpp        2010-05-02 03:05:27 UTC (rev 
4891)
@@ -26,8 +26,8 @@
 #   pragma hdrstop
 #endif // __BORLANDC__
 
+#include "dbdict.hpp"
 #include "fund_data.hpp"
-#include "ihs_dbdict.hpp"
 #include "main_common.hpp"
 #include "path_utility.hpp" // initialize_filesystem()
 #include "product_data.hpp"

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2010-05-02 02:29:44 UTC (rev 4890)
+++ lmi/trunk/ihs_basicval.cpp  2010-05-02 03:05:27 UTC (rev 4891)
@@ -35,12 +35,12 @@
 #include "configurable_settings.hpp"
 #include "data_directory.hpp"
 #include "database.hpp"
+#include "dbdict.hpp"
 #include "dbnames.hpp"
 #include "death_benefits.hpp"
 #include "et_vector.hpp"
 #include "fund_data.hpp"
 #include "global_settings.hpp"
-#include "ihs_dbdict.hpp"
 #include "ihs_irc7702.hpp"
 #include "ihs_irc7702a.hpp"
 #include "ihs_x_type.hpp"

Modified: lmi/trunk/ihs_database.cpp
===================================================================
--- lmi/trunk/ihs_database.cpp  2010-05-02 02:29:44 UTC (rev 4890)
+++ lmi/trunk/ihs_database.cpp  2010-05-02 03:05:27 UTC (rev 4891)
@@ -34,9 +34,9 @@
 #include "alert.hpp"
 #include "assert_lmi.hpp"
 #include "data_directory.hpp"
+#include "dbdict.hpp"
 #include "dbnames.hpp"
 #include "dbvalue.hpp"
-#include "ihs_dbdict.hpp"
 #include "oecumenic_enumerations.hpp"
 #include "product_data.hpp"
 #include "yare_input.hpp"

Modified: lmi/trunk/ihs_dbdict.cpp
===================================================================
--- lmi/trunk/ihs_dbdict.cpp    2010-05-02 02:29:44 UTC (rev 4890)
+++ lmi/trunk/ihs_dbdict.cpp    2010-05-02 03:05:27 UTC (rev 4891)
@@ -26,7 +26,7 @@
 #   pragma hdrstop
 #endif // __BORLANDC__
 
-#include "ihs_dbdict.hpp"
+#include "dbdict.hpp"
 
 #include "alert.hpp"
 #include "data_directory.hpp"

Deleted: lmi/trunk/ihs_dbdict.hpp
===================================================================
--- lmi/trunk/ihs_dbdict.hpp    2010-05-02 02:29:44 UTC (rev 4890)
+++ lmi/trunk/ihs_dbdict.hpp    2010-05-02 03:05:27 UTC (rev 4891)
@@ -1,85 +0,0 @@
-// Product-database map.
-//
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 
2009, 2010 Gregory W. Chicares.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-//
-// http://savannah.nongnu.org/projects/lmi
-// email: <address@hidden>
-// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-
-// $Id$
-
-#ifndef ihs_dbdict_hpp
-#define ihs_dbdict_hpp
-
-#ifdef dbdict_hpp
-#   error Probable lmi/ihs header conflict.
-#endif // dbdict_hpp
-
-#include "config.hpp"
-
-#include "dbvalue.hpp" // Needed here for map declaration.
-#include "obstruct_slicing.hpp"
-#include "so_attributes.hpp"
-
-#include <boost/utility.hpp>
-
-#include <map>
-#include <string>
-
-typedef std::map<int, TDBValue> dict_map;
-typedef dict_map::value_type dict_map_val;
-
-class LMI_SO DBDictionary
-    :private boost::noncopyable
-    ,virtual private obstruct_slicing<DBDictionary>
-{
-    friend class DatabaseDocument;
-    friend class product_file_test;
-
-  public:
-    static DBDictionary& instance();
-    ~DBDictionary();
-
-    dict_map const& GetDictionary() const;
-
-    void Init(std::string const& NewFilename);
-    void WriteSampleDBFile();
-    void WriteProprietaryDBFiles();
-
-  private:
-    DBDictionary();
-
-    void WriteDB(std::string const& filename);
-    void Add(TDBValue const&);
-    void BadFile(std::string const& Filename, std::string const& why);
-    void InitDB();
-
-    void InitAntediluvian(); // Antediluvian
-
-    static void InvalidateCache();
-
-    static std::string CachedFilename;
-
-    void AddEntry(dict_map_val const&); // Antediluvian
-
-    dict_map dictionary_;
-    dict_map* dictionary; // Antediluvian
-};
-
-void LMI_SO print_databases();
-
-#endif // ihs_dbdict_hpp
-

Modified: lmi/trunk/main_wx.cpp
===================================================================
--- lmi/trunk/main_wx.cpp       2010-05-02 02:29:44 UTC (rev 4890)
+++ lmi/trunk/main_wx.cpp       2010-05-02 03:05:27 UTC (rev 4891)
@@ -48,6 +48,7 @@
 #include "data_directory.hpp"
 #include "database_document.hpp"
 #include "database_view.hpp"
+#include "dbdict.hpp"               // print_databases()
 #include "default_view.hpp"
 #include "docmanager_ex.hpp"
 #include "docmdichildframe_ex.hpp"
@@ -57,7 +58,6 @@
 #include "global_settings.hpp"
 #include "handle_exceptions.hpp"
 #include "icon_monger.hpp"
-#include "ihs_dbdict.hpp"           // print_databases()
 #include "illustration_document.hpp"
 #include "illustration_view.hpp"
 #include "license.hpp"

Modified: lmi/trunk/my_db.cpp
===================================================================
--- lmi/trunk/my_db.cpp 2010-05-02 02:29:44 UTC (rev 4890)
+++ lmi/trunk/my_db.cpp 2010-05-02 03:05:27 UTC (rev 4891)
@@ -39,7 +39,7 @@
 #   pragma hdrstop
 #endif // __BORLANDC__
 
-#include "ihs_dbdict.hpp"
+#include "dbdict.hpp"
 
 #include "data_directory.hpp"
 #include "dbnames.hpp"

Modified: lmi/trunk/product_file_test.cpp
===================================================================
--- lmi/trunk/product_file_test.cpp     2010-05-02 02:29:44 UTC (rev 4890)
+++ lmi/trunk/product_file_test.cpp     2010-05-02 03:05:27 UTC (rev 4891)
@@ -26,8 +26,8 @@
 #   pragma hdrstop
 #endif // __BORLANDC__
 
+#include "dbdict.hpp"
 #include "fund_data.hpp"
-#include "ihs_dbdict.hpp"
 #include "path_utility.hpp" // initialize_filesystem()
 #include "product_data.hpp"
 #include "rounding_rules.hpp"