ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/openbabel/data.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/openbabel/data.cpp (file contents):
Revision 2440 by tim, Wed Nov 16 19:42:11 2005 UTC vs.
Revision 2450 by gezelter, Thu Nov 17 20:38:45 2005 UTC

# Line 21 | Line 21 | GNU General Public License for more details.
21   #pragma warning (disable : 4786)
22   #endif
23  
24 < #include "babelconfig.hpp"
24 > #include "config.h"
25   #include "data.hpp"
26   #include "mol.hpp"
27  
# Line 79 | Line 79 | OBElementTable::OBElementTable()
79   OBElementTable::OBElementTable()
80   {
81      _init = false;
82 <    _dir = BABEL_DATADIR;
83 <    _envvar = "BABEL_DATADIR";
82 >    STR_DEFINE(_dir, FRC_PATH);
83 >    _envvar = "FORCE_PARAM_PATH";
84      _filename = "element.txt";
85      _subdir = "data";
86      _dataptr = ElementData;
# Line 331 | Line 331 | OBIsotopeTable::OBIsotopeTable()
331   OBIsotopeTable::OBIsotopeTable()
332   {
333      _init = false;
334 <    _dir = BABEL_DATADIR;
335 <    _envvar = "BABEL_DATADIR";
334 >    STR_DEFINE(_dir, FRC_PATH);
335 >    _envvar = "FORCE_PARAM_PATH";
336      _filename = "isotope.txt";
337      _subdir = "data";
338      _dataptr = IsotopeData;
# Line 435 | Line 435 | OBTypeTable::OBTypeTable()
435   OBTypeTable::OBTypeTable()
436   {
437      _init = false;
438 <    _dir = BABEL_DATADIR;
439 <    _envvar = "BABEL_DATADIR";
438 >    STR_DEFINE(_dir, FRC_PATH);
439 >    _envvar = "FORCE_PARAM_PATH";
440      _filename = "types.txt";
441      _subdir = "data";
442      _dataptr = TypesData;
# Line 590 | Line 590 | OBResidueData::OBResidueData()
590   OBResidueData::OBResidueData()
591   {
592      _init = false;
593 <    _dir = BABEL_DATADIR;
594 <    _envvar = "BABEL_DATADIR";
593 >    STR_DEFINE(_dir, FRC_PATH);
594 >    _envvar = "FORCE_PARAM_PATH";
595      _filename = "resdata.txt";
596      _subdir = "data";
597      _dataptr = ResidueData;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines