Some string(widget->text()) fixes. Weirdness

[lyx.git] / src / frontends / qt2 / QPreambleDialog.C

diff --git a/src/frontends/qt2/QPreambleDialog.C b/src/frontends/qt2/QPreambleDialog.C
index e1eda7b5965187be3f2a3637d4074da28f635821..44ffb0519c6b44f9fc60612a3247a79d55ff5d1b 100644 (file)
--- a/src/frontends/qt2/QPreambleDialog.C
+++ b/src/frontends/qt2/QPreambleDialog.C
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author John Levon 
+ * \author John Levon
  *
  * Full author contact details are available in file CREDITS
  */
@@ -14,8 +14,7 @@
 #pragma implementation
 #endif
 
-#include <fstream>
-
+#include "Lsstream.h"
 #include "support/lyxlib.h"
 #include "support/forkedcall.h"
 #include "support/filetools.h"
@@ -30,6 +29,8 @@
 #include <qmultilineedit.h>
 #include <qinputdialog.h>
 
+#include <fstream>
+
 using std::getline;
 
 QPreambleDialog::QPreambleDialog(QPreamble * form)
@@ -63,7 +64,7 @@ void QPreambleDialog::editClicked()
        // find an editor
        string editor = GetEnv("EDITOR");
        if (editor.empty()) {
-               static string lastentry = "";
+               static string lastentry;
                editor = QInputDialog::getText(
                        _("Enter editor program"), _("Editor"), QLineEdit::Normal,
                        lastentry.c_str()).latin1();
@@ -84,7 +85,7 @@ void QPreambleDialog::editClicked()
 
        file.close();
 
-       editor += " " + filename;
+       editor += ' ' + filename;
 
        Forkedcall call;
 
@@ -101,14 +102,12 @@ void QPreambleDialog::editClicked()
                return;
        }
 
-       string newtext;
-       string line;
-
-       while (getline(in, line)) {
-               newtext += line + "\n";
-       }
+       ostringstream newtext;
+       newtext << in.rdbuf();
 
+       // close the files before we delete the file
        in.close();
+
        lyx::unlink(filename);
-       preambleLE->setText(newtext.c_str());
+       preambleLE->setText(newtext.str().c_str());
 }