Changeset bd86e8 for molecuilder/src/config.cpp

Timestamp:

Jul 9, 2009, 11:01:08 AM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

ab7b5e7

Parents:

c12297

git-author:

Frederik Heber <heber@…> (07/09/09 10:59:00)

git-committer:

Frederik Heber <heber@…> (07/09/09 11:01:08)

Message:

Changed the unsatisfactory PathToDatabases construct, removing warning deprecated conversion from string constant to char *

• new variable config::databasepath (initialized in config constructor, released in destructor)
• Store.../LoadPeriodentafel() now have to receive const char *
• PathToDatabases is removed, instead LocalPath is copied into config::databasepath

File:

• molecuilder/src/config.cpp (modified) (2 diffs)

molecuilder/src/config.cpp

@@ -14 +14 @@
 {
         mainname = (char *) MallocString(sizeof(char)*MAXSTRINGSIZE,"config constructor: mainname");
-        defaultpath = (char *) MallocString(sizeof(char)*MAXSTRINGSIZE,"config constructor: mainname");
-        pseudopotpath = (char *) MallocString(sizeof(char)*MAXSTRINGSIZE,"config constructor: mainname");
-        configpath = (char *) MallocString(sizeof(char)*MAXSTRINGSIZE,"config constructor: mainname");
-        configname = (char *) MallocString(sizeof(char)*MAXSTRINGSIZE,"config constructor: mainname");
+        defaultpath = (char *) MallocString(sizeof(char)*MAXSTRINGSIZE,"config constructor: defaultpath");
+        pseudopotpath = (char *) MallocString(sizeof(char)*MAXSTRINGSIZE,"config constructor: pseudopotpath");
+  databasepath = (char *) MallocString(sizeof(char)*MAXSTRINGSIZE,"config constructor: databasepath");
+        configpath = (char *) MallocString(sizeof(char)*MAXSTRINGSIZE,"config constructor: configpath");
+        configname = (char *) MallocString(sizeof(char)*MAXSTRINGSIZE,"config constructor: configname");
         strcpy(mainname,"pcp");
         strcpy(defaultpath,"not specified");
@@ -93 +94 @@
         Free((void **)&defaultpath, "config::~config: *defaultpath");
         Free((void **)&pseudopotpath, "config::~config: *pseudopotpath");
+  Free((void **)&databasepath, "config::~config: *databasepath");
         Free((void **)&configpath, "config::~config: *configpath");
         Free((void **)&configname, "config::~config: *configname");