change "support/std_sstream.h" to <sstream>

[features.git] / src / frontends / controllers / ControlAboutlyx.C

diff --git a/src/frontends/controllers/ControlAboutlyx.C b/src/frontends/controllers/ControlAboutlyx.C
index 1887f0f63a851cb9c199a38e7dd178d966ad35dc..6591b6f7488061f231dedea8bb4c63760c649dd1 100644 (file)
--- a/src/frontends/controllers/ControlAboutlyx.C
+++ b/src/frontends/controllers/ControlAboutlyx.C
@@ -6,27 +6,34 @@
  * \author Edwin Leuven
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-
 #include "ControlAboutlyx.h"
 #include "gettext.h"
 #include "version.h"
-#include "Lsstream.h"
 
-#include "support/LOstream.h"
 #include "support/filetools.h" // FileSearch
+#include "support/path_defines.h"
 
 #include <fstream>
+#include <sstream>
 
 using std::ostream;
+using std::ostringstream;
+using std::string;
+
+
+namespace lyx {
 
-// needed for the browser
-extern string system_lyxdir;
-extern string user_lyxdir;
+using support::FileSearch;
+using support::MakeDisplayPath;
+using support::system_lyxdir;
+using support::user_lyxdir;
+
+namespace frontend {
 
 
 ControlAboutlyx::ControlAboutlyx(Dialog & parent)
@@ -36,7 +43,7 @@ ControlAboutlyx::ControlAboutlyx(Dialog & parent)
 
 void ControlAboutlyx::getCredits(ostream & ss) const
 {
-       string const name = FileSearch(system_lyxdir, "CREDITS");
+       string const name = FileSearch(system_lyxdir(), "CREDITS");
 
        bool found(!name.empty());
 
@@ -83,10 +90,13 @@ string const ControlAboutlyx::getVersion() const
           << lyx_release_date
           << "\n"
           << _("Library directory: ")
-          << MakeDisplayPath(system_lyxdir)
+          << MakeDisplayPath(system_lyxdir())
           << "\n"
           << _("User directory: ")
-          << MakeDisplayPath(user_lyxdir);
+          << MakeDisplayPath(user_lyxdir());
 
-       return STRCONV(ss.str());
+       return ss.str();
 }
+
+} // namespace frontend
+} // namespace lyx