Enable convertDefault.sh to run even if its executable bit is not set.

[lyx.git] / src / insets / ExternalTemplate.C

diff --git a/src/insets/ExternalTemplate.C b/src/insets/ExternalTemplate.C
index bfa1e851b86d53ad6e372446f733ee52e04d0f25..2443e0756f66d3318666681b3d039db76b01e433 100644 (file)
--- a/src/insets/ExternalTemplate.C
+++ b/src/insets/ExternalTemplate.C
@@ -5,7 +5,7 @@
  *
  * \author Asger Alstrup Nielsen
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -20,14 +20,14 @@
 #include "support/path.h"
 #include "support/LAssert.h"
 #include "support/filetools.h"
+#include "support/path_defines.h"
+
+using namespace lyx::support;
 
 using std::endl;
 using std::ostream;
 using std::for_each;
 
-extern string user_lyxdir;
-
-
 // We have to have dummy default commands for security reasons!
 
 ExternalTemplate::ExternalTemplate()
@@ -42,7 +42,7 @@ ExternalTemplate::FormatTemplate::FormatTemplate()
 ExternalTemplateManager::ExternalTemplateManager()
 {
        // gimp gnuchess gnuplot ical netscape tetris xpaint
-       readTemplates(user_lyxdir);
+       readTemplates(user_lyxdir());
        if (lyxerr.debugging())
                dumpTemplates();
 }
@@ -248,7 +248,7 @@ void ExternalTemplate::readTemplate(LyXLex & lex)
                default:
                        lex.printError("ExternalTemplate::readTemplate: "
                                       "Wrong tag: $$Token");
-                       lyx::Assert(false);
+                       Assert(false);
                        break;
                }
        }