Use helper function to find xslt folder

This seems much better than the different hard coded and semi-hard coded
paths we had before.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-10-04 13:21:31 -07:00
parent ae713763c7
commit f8708e2921
3 changed files with 4 additions and 3 deletions

2
dive.h
View file

@ -611,6 +611,8 @@ extern void save_dive(FILE *f, struct dive *dive);
extern xsltStylesheetPtr get_stylesheet(const char *name);
extern char *xslt_path;
extern timestamp_t utc_mktime(struct tm *tm);
extern void utc_mkdate(timestamp_t, struct tm *tm);

View file

@ -20,6 +20,7 @@
int verbose;
static xmlDoc *test_xslt_transforms(xmlDoc *doc, char **error);
char *xslt_path;
/* the dive table holds the overall dive list; target table points at
* the table we are currently filling */
@ -1852,9 +1853,6 @@ void parse_xml_exit(void)
xmlCleanupParser();
}
/* Maybe we'll want a environment variable that can override this.. */
static const char *xslt_path = XSLT ":xslt:.";
static xsltStylesheetPtr try_get_stylesheet(const char *path, int len, const char *name)
{
xsltStylesheetPtr ret;

View file

@ -103,6 +103,7 @@ void init_ui(int *argcp, char ***argvp)
QCoreApplication::setOrganizationName("Subsurface");
QCoreApplication::setOrganizationDomain("subsurface.hohndel.org");
QCoreApplication::setApplicationName("Subsurface");
xslt_path = strdup(getSubsurfaceDataPath("xslt").toAscii().data());
QSettings s;
s.beginGroup("GeneralSettings");