From ce07524d36bfa917122c9674a6992058f7676128 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 23 Mar 2001 15:16:03 +0000 Subject: [PATCH] fix print bug & compilation problem git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1813 a592a061-630c-0410-9148-cb99ea01b6c8 --- po/POTFILES.in | 58 +++++++++++----------- src/ChangeLog | 4 ++ src/LString.h | 1 + src/frontends/ChangeLog | 5 ++ src/frontends/Liason.C | 3 +- src/frontends/controllers/ChangeLog | 5 ++ src/frontends/controllers/ControlCredits.C | 2 +- 7 files changed, 47 insertions(+), 31 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index b864e7206a..7b50b589dc 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -82,67 +82,67 @@ src/frontends/qt2/paragraphdlgimpl.C src/frontends/qt2/tabularcreatedlgimpl.C src/frontends/xforms/combox.C src/frontends/xforms/FileDialog.C -src/frontends/xforms/form_bibitem.C src/frontends/xforms/FormBibitem.C -src/frontends/xforms/form_bibtex.C +src/frontends/xforms/form_bibitem.C src/frontends/xforms/FormBibtex.C +src/frontends/xforms/form_bibtex.C src/frontends/xforms/form_browser.C -src/frontends/xforms/form_character.C src/frontends/xforms/FormCharacter.C -src/frontends/xforms/form_citation.C +src/frontends/xforms/form_character.C src/frontends/xforms/FormCitation.C -src/frontends/xforms/form_copyright.C +src/frontends/xforms/form_citation.C src/frontends/xforms/FormCopyright.C -src/frontends/xforms/form_credits.C +src/frontends/xforms/form_copyright.C src/frontends/xforms/FormCredits.C -src/frontends/xforms/form_document.C +src/frontends/xforms/form_credits.C src/frontends/xforms/FormDocument.C -src/frontends/xforms/form_error.C +src/frontends/xforms/form_document.C src/frontends/xforms/FormError.C -src/frontends/xforms/form_external.C +src/frontends/xforms/form_error.C src/frontends/xforms/FormExternal.C -src/frontends/xforms/form_filedialog.C +src/frontends/xforms/form_external.C src/frontends/xforms/FormFiledialog.C -src/frontends/xforms/form_graphics.C +src/frontends/xforms/form_filedialog.C src/frontends/xforms/FormGraphics.C -src/frontends/xforms/form_include.C +src/frontends/xforms/form_graphics.C src/frontends/xforms/FormInclude.C -src/frontends/xforms/form_index.C +src/frontends/xforms/form_include.C src/frontends/xforms/FormIndex.C +src/frontends/xforms/form_index.C src/frontends/xforms/FormLog.C src/frontends/xforms/FormMathsBitmap.C -src/frontends/xforms/form_maths_deco.C src/frontends/xforms/FormMathsDeco.C -src/frontends/xforms/form_maths_delim.C +src/frontends/xforms/form_maths_deco.C src/frontends/xforms/FormMathsDelim.C -src/frontends/xforms/form_maths_matrix.C +src/frontends/xforms/form_maths_delim.C src/frontends/xforms/FormMathsMatrix.C -src/frontends/xforms/form_maths_panel.C +src/frontends/xforms/form_maths_matrix.C src/frontends/xforms/FormMathsPanel.C -src/frontends/xforms/form_maths_space.C +src/frontends/xforms/form_maths_panel.C src/frontends/xforms/FormMathsSpace.C -src/frontends/xforms/form_minipage.C +src/frontends/xforms/form_maths_space.C src/frontends/xforms/FormMinipage.C -src/frontends/xforms/form_paragraph.C +src/frontends/xforms/form_minipage.C src/frontends/xforms/FormParagraph.C -src/frontends/xforms/form_preamble.C +src/frontends/xforms/form_paragraph.C src/frontends/xforms/FormPreamble.C -src/frontends/xforms/form_preferences.C +src/frontends/xforms/form_preamble.C src/frontends/xforms/FormPreferences.C -src/frontends/xforms/form_print.C +src/frontends/xforms/form_preferences.C src/frontends/xforms/FormPrint.C -src/frontends/xforms/form_ref.C +src/frontends/xforms/form_print.C src/frontends/xforms/FormRef.C -src/frontends/xforms/form_search.C +src/frontends/xforms/form_ref.C src/frontends/xforms/FormSearch.C -src/frontends/xforms/form_tabular.C +src/frontends/xforms/form_search.C src/frontends/xforms/FormTabular.C -src/frontends/xforms/form_tabular_create.C +src/frontends/xforms/form_tabular.C src/frontends/xforms/FormTabularCreate.C -src/frontends/xforms/form_toc.C +src/frontends/xforms/form_tabular_create.C src/frontends/xforms/FormToc.C -src/frontends/xforms/form_url.C +src/frontends/xforms/form_toc.C src/frontends/xforms/FormUrl.C +src/frontends/xforms/form_url.C src/frontends/xforms/FormVCLog.C src/frontends/xforms/input_validators.C src/frontends/xforms/Menubar_pimpl.C diff --git a/src/ChangeLog b/src/ChangeLog index 06064a5292..98154035de 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2001-03-23 Jean-Marc Lasgouttes + + * LString.h: add "using std::getline" when using the real . + 2001-03-23 José Abílio Matos * buffer.C: removed bitset usage. diff --git a/src/LString.h b/src/LString.h index 3a684322a1..7a4779d727 100644 --- a/src/LString.h +++ b/src/LString.h @@ -15,6 +15,7 @@ #ifndef USE_INCLUDED_STRING #include using std::string; +using std::getline #else #ifdef __STRING__ #error The header has been included before LString.h diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index a76f3d3d00..942fd02a2c 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,8 @@ +2001-03-22 Jean-Marc Lasgouttes + + * Liason.C (printBuffer): do not forget file name + when printing with empty print_spool_command. + 2001-03-20 Angus Leeming * ButtonPolicies.[Ch]: removed (thought I did this before?). The files diff --git a/src/frontends/Liason.C b/src/frontends/Liason.C index 3b17230a6c..5b66b8a94d 100644 --- a/src/frontends/Liason.C +++ b/src/frontends/Liason.C @@ -140,7 +140,8 @@ bool printBuffer(Buffer * buffer, PrinterParams const & pp) command2); } else // case 2 - res = one.startscript(Systemcalls::SystemDontWait, command); + res = one.startscript(Systemcalls::SystemDontWait, + command + QuoteName(dviname)); break; case PrinterParams::FILE: diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 60c6350541..0e4d7f4bcd 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,8 @@ +2001-03-23 Jean-Marc Lasgouttes + + * ControlCredits.C (getCredits): remove std:: qualifier for + getline(). + 2001-03-23 Lars Gullik Bjønnes * ControlCredits.C (getCredits): add std:: on vector diff --git a/src/frontends/controllers/ControlCredits.C b/src/frontends/controllers/ControlCredits.C index 25fdb388b9..35f2c5bc33 100644 --- a/src/frontends/controllers/ControlCredits.C +++ b/src/frontends/controllers/ControlCredits.C @@ -54,7 +54,7 @@ std::vector const ControlCredits::getCredits() const for(;;) { string line; - std::getline(in, line); + getline(in, line); if (!in.good()) break; data.push_back(line); }