Add a buffer_path arg to InsetGraphicsMailer's params2string, string2params.

[lyx.git] / src / frontends / controllers / ControlPrefs.C

diff --git a/src/frontends/controllers/ControlPrefs.C b/src/frontends/controllers/ControlPrefs.C
index 366f72830cb7e1e78caf63670ef6f4755a569772..ed442139e54797d1eafd3fdc55005f1a5b4ab7c5 100644 (file)
--- a/src/frontends/controllers/ControlPrefs.C
+++ b/src/frontends/controllers/ControlPrefs.C
@@ -10,9 +10,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include <utility>
 
@@ -26,12 +23,15 @@
 #include "support/filetools.h"
 #include "frontends/Dialogs.h"
 #include "converter.h"
+#include "format.h"
 #include "debug.h"
 
 extern string system_lyxdir;
 extern string user_lyxdir;
 extern BufferList bufferlist;
 
+using namespace lyx::support;
+
 using std::endl;
 using std::pair;
 
@@ -72,7 +72,7 @@ string const ControlPrefs::browsebind(string const & file)
        name = _("User Bind|#U#u");
        pair<string,string> dir2(name, dir);
 
-       return browseFile(&lv_, file, _("Choose bind file"), "*.bind", false, dir1, dir2);
+       return browseFile(file, _("Choose bind file"), "*.bind", false, dir1, dir2);
 }
 
 
@@ -88,7 +88,7 @@ string const ControlPrefs::browseUI(string const & file)
        name = _("User UI|#U#u");
        pair<string,string> dir2(name, dir);
 
-       return browseFile(&lv_, file, _("Choose UI file"), "*.ui", false, dir1, dir2);
+       return browseFile(file, _("Choose UI file"), "*.ui", false, dir1, dir2);
 }
 
 
@@ -98,25 +98,25 @@ string const ControlPrefs::browsekbmap(string const & file)
        string const name = _("Key maps|#K#k");
        pair<string, string> dir1(name, dir);
 
-       return browseFile(&lv_, file, _("Choose keyboard map"), "*.kmap", false, dir1);
+       return browseFile(file, _("Choose keyboard map"), "*.kmap", false, dir1);
 }
 
 
 string const ControlPrefs::browsedict(string const & file)
 {
-       return browseFile(&lv_, file, _("Choose personal dictionary"), "*.ispell");
+       return browseFile(file, _("Choose personal dictionary"), "*.ispell");
 }
 
 
 string const ControlPrefs::browse(string const & file, string const & title)
 {
-       return browseFile(&lv_, file, title, "*", true);
+       return browseFile(file, title, "*", true);
 }
 
 
 string const ControlPrefs::browsedir(string const & path, string const & title)
 {
-       return browseDir(&lv_, path, title);
+       return browseDir(path, title);
 }