From 397898434e52ba1e1cc593e83d43080918698a9b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 16 Dec 2013 09:09:42 -0800 Subject: Remove the xslt_path now that all XSLT files are kept in a resource Signed-off-by: Thiago Macieira Signed-off-by: Dirk Hohndel --- dive.h | 2 -- parse-xml.c | 3 +-- qt-gui.cpp | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dive.h b/dive.h index 0ee3a1aa6..46c42fc4c 100644 --- a/dive.h +++ b/dive.h @@ -637,8 +637,6 @@ extern void shift_times(const timestamp_t amount); 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); diff --git a/parse-xml.c b/parse-xml.c index ea9e96a5e..1812b7dc2 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -22,7 +22,6 @@ int verbose, quit; static xmlDoc *test_xslt_transforms(xmlDoc *doc, const char **params, char **error); -char *xslt_path; /* the dive table holds the overall dive list; target table points at * the table we are currently filling */ @@ -2012,7 +2011,7 @@ static xmlDoc *test_xslt_transforms(xmlDoc *doc, const char **params, char **err xmlSubstituteEntitiesDefault(1); xslt = get_stylesheet(info->file); if (xslt == NULL) { - parser_error(error, translate("gettextFromC","Can't open stylesheet (%s)/%s"), xslt_path, info->file); + parser_error(error, translate("gettextFromC","Can't open stylesheet %s"), info->file); return doc; } transformed = xsltApplyStylesheet(xslt, doc, params); diff --git a/qt-gui.cpp b/qt-gui.cpp index 67061ef81..84e79a99f 100644 --- a/qt-gui.cpp +++ b/qt-gui.cpp @@ -88,7 +88,6 @@ void init_ui(int *argcp, char ***argvp) QCoreApplication::setApplicationName("Subsurface"); // find plugins installed in the application directory (without this SVGs don't work on Windows) QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath()); - xslt_path = strdup(getSubsurfaceDataPath("xslt").toAscii().data()); QSettings s; s.beginGroup("Language"); -- cgit v1.2.3-70-g09d2