Replace LString.h with support/std_string.h,

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

diff --git a/src/frontends/controllers/ControlAboutlyx.C b/src/frontends/controllers/ControlAboutlyx.C
index 6531654fb9dddd4e232141fb94f948100e266c86..179f12c647657e4e1e0589e3ca03c556cc9738a4 100644 (file)
--- a/src/frontends/controllers/ControlAboutlyx.C
+++ b/src/frontends/controllers/ControlAboutlyx.C
@@ -6,40 +6,35 @@
  * \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>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "ControlAboutlyx.h"
 #include "gettext.h"
 #include "version.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
-#include "support/LOstream.h"
 #include "support/filetools.h" // FileSearch
+#include "support/path_defines.h"
 
 #include <fstream>
 
-using std::ostream;
+using namespace lyx::support;
 
-// needed for the browser
-extern string system_lyxdir;
-extern string user_lyxdir;
+using std::ostream;
 
 
-ControlAboutlyx::ControlAboutlyx(LyXView & lv, Dialogs & d)
-       : ControlDialogBI(lv, d)
+ControlAboutlyx::ControlAboutlyx(Dialog & parent)
+       : Dialog::Controller(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());
 
@@ -86,10 +81,10 @@ 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());
 }