X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FExternalTemplate.C;h=b27255d48dabffac411b0459834242459655f2eb;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=5653623d4dbe2c2775239d9e2aa75d5ffe847452;hpb=958bd96f539bcca03283e144b935abf7e3747af1;p=lyx.git

diff --git a/src/insets/ExternalTemplate.C b/src/insets/ExternalTemplate.C
index 5653623d4d..b27255d48d 100644
--- a/src/insets/ExternalTemplate.C
+++ b/src/insets/ExternalTemplate.C
@@ -21,26 +21,33 @@
 #include "support/package.h"
 #include "support/path.h"
 
-namespace support = lyx::support;
-
 using std::endl;
 using std::for_each;
-
 using std::string;
 using std::ostream;
 using std::vector;
 
-
 namespace lyx {
 namespace external {
 
-namespace {
 
 typedef Translator<TransformID, string> TransformIDTranslator;
-TransformIDTranslator const & transformIDTranslator();
 
-} // namespace anon
+static TransformIDTranslator const initIDTranslator()
+{
+	TransformIDTranslator translator(TransformID(-1), "");
+	translator.addPair(Rotate, "Rotate");
+	translator.addPair(Resize, "Resize");
+	translator.addPair(Clip,   "Clip");
+	translator.addPair(Extra,  "Extra");
+	return translator;
+}
 
+static TransformIDTranslator const & transformIDTranslator()
+{
+	static TransformIDTranslator const translator = initIDTranslator();
+	return translator;
+}
 
 // We have to have dummy default commands for security reasons!
 Template::Template()
@@ -246,7 +253,7 @@ void TemplateManager::readTemplates(string const & path)
 
 	LyXLex lex(templatetags, TM_TEMPLATE_END);
 
-	string filename = support::LibFileSearch("", "external_templates");
+	support::FileName const filename = support::libFileSearch("", "external_templates");
 	if (filename.empty() || !lex.setFile(filename)) {
 		lex.printError("external::TemplateManager::readTemplates: "
 			       "No template file");
@@ -556,26 +563,5 @@ void Template::Format::readFormat(LyXLex & lex)
 	}
 }
 
-namespace {
-
-TransformIDTranslator const initIDTranslator()
-{
-	TransformIDTranslator translator(TransformID(-1), "");
-	translator.addPair(Rotate, "Rotate");
-	translator.addPair(Resize, "Resize");
-	translator.addPair(Clip,   "Clip");
-	translator.addPair(Extra,  "Extra");
-	return translator;
-}
-
-
-TransformIDTranslator const & transformIDTranslator()
-{
-	static TransformIDTranslator const translator = initIDTranslator();
-	return translator;
-}
-
-} // namespace anon
-
 } // namespace external
 } // namespace lyx