diff options
| author |  Thiago Macieira <thiago@macieira.org> | 2013-12-16 09:09:42 -0800 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-12-16 16:20:54 -0800 |
| commit | 397898434e52ba1e1cc593e83d43080918698a9b (patch) | |
| tree | 30bc37b0b20b3176382e54739adbaf2cd7c07c57 | |
| parent | ca8aee4701f95a758f93033eb88ca851d61b2008 (diff) | |
| download | subsurface-397898434e52ba1e1cc593e83d43080918698a9b.tar.gz | |
Remove the xslt_path now that all XSLT files are kept in a resource
Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | dive.h | 2 | ||||
| -rw-r--r-- | parse-xml.c | 3 | ||||
| -rw-r--r-- | qt-gui.cpp | 1 |
3 files changed, 1 insertions, 5 deletions
@@ -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"); |