From: Angus Leeming Date: Tue, 20 Apr 2004 08:51:15 +0000 (+0000) Subject: Whitespace, only whitespace... X-Git-Tag: 1.6.10~15288 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c4762f94524c53ffc2200016678b4d032013b366;p=features.git Whitespace, only whitespace... git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8682 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index d264edeb59..8144d511db 100644 --- a/src/BufferView_pimpl.C +++ b/src/BufferView_pimpl.C @@ -885,7 +885,7 @@ bool BufferView::Pimpl::workAreaDispatch(FuncRequest const & cmd0) inset->dispatch(cur, cmd); // Now dispatch to the temporary cursor. If the real cursor should - // be modified, the inset's dispatch has to do so explicitly. + // be modified, the inset's dispatch has to do so explicitly. if (!res.dispatched()) res = cur.dispatch(cmd); diff --git a/src/ChangeLog b/src/ChangeLog index 577e362def..2fd3e76a02 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -52,11 +52,11 @@ * LaTeXFeatures.[Ch]: change buffer_ to a pointer and add accessor setBuffer() - + 2004-04-07 Alfredo Braunstein * BufferView.C (setCursor): call redoParagraph (some insets could - have been opened) + have been opened) (putSelectionAt): remove the 'double update' trick * BufferView_pimpl.C (fitCursor): call refreshPar @@ -67,12 +67,12 @@ (selHandle): set noUpdate when appropriate * lyxfunc.C (dispatch): track if we need an update - + * metricsinfo.[Ch]: PainterInfo receive a Painter & on construction * rowpainter.[Ch] (RowPainter): remove superfluous xo_ parameter (paintSelection): cheap optimization, do not call cursorX when not - needed + needed (paintPars): change signature (refreshPar): add (paintText): adjust @@ -107,7 +107,7 @@ * cursor_slice.C: more agressive assert * lyxfunc.C: - * BufferView_pimpl.C: rework mouse event dispatch + * BufferView_pimpl.C: rework mouse event dispatch * dociterator.C: * paragraph.C: @@ -145,7 +145,7 @@ * BufferView_pimpl.[Ch] (getStatus) * BufferView.[Ch] (getStatus): add * lyxfunc.C (getStatus): move lfuns handled in - BufferView::dispatch to te function above + BufferView::dispatch to te function above * Cursor.C (setSelection): set selection() = true 2004-04-01 Alfredo Braunstein @@ -211,7 +211,7 @@ * lyxfunc.C (dispatch): the specialization Dialogs::showDocument has died. Fall through to the generic Dialogs::show("document"). - + 2004-03-30 Angus Leeming * lfuns.h: @@ -253,13 +253,13 @@ 2004-03-30 Alfredo Braunstein - * dociterator.[Ch]: add an inset_ member + * dociterator.[Ch]: add an inset_ member (backwardPos): implemented (backwardPos, forwardPos): use inset_ when the stack is empty. (doc_iterator_begin, doc_iterator_end): implemented * pariterator.[Ch]: adjust, add begin, end * insetiterator.[Ch]: adjust, add begin, end - * cursor.C: + * cursor.C: * document.C: * BufferView.C: * BufferView_pimpl.C: @@ -270,10 +270,10 @@ * buffer.C: increment file format to 232. * LaTeXFeatures.C: add bibtopic package. * bufferparams.[Ch]: param \use_bibtopic. - + * lyxrc.[Ch]: add lyxrc bibtex_command * LaTeX.C: use rc.bibtex_command instead of hardcoded string. - + * buffer.C: increment file format to 231. 2004-03-28 Alfredo Braunstein @@ -290,7 +290,7 @@ * lyxfind.C * lyxfunc.C * paragraph_funcs.C - * toc.C: + * toc.C: * Makefile.am: adjust 2004-03-28 Alfredo Braunstein @@ -345,7 +345,7 @@ 2004-03-26 Alfredo Braunstein - * buffer_funcs.C (readFile): add cancel button to two prompt dialogs + * buffer_funcs.C (readFile): add cancel button to two prompt dialogs 2004-03-26 Jean-Marc Lasgouttes @@ -366,8 +366,8 @@ 2004-03-25 Jean-Marc Lasgouttes Martin Vermeer - * lyxfunc.C (dispatch): - * bufferparams.C (readToken): use the new LColor::setColor + * lyxfunc.C (dispatch): + * bufferparams.C (readToken): use the new LColor::setColor * LColor.[Ch] (setColor): new version that takes two strings as argument and creates a new color entry if necessary diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C index 2ed08ebf0a..76bb471f82 100644 --- a/src/CutAndPaste.C +++ b/src/CutAndPaste.C @@ -455,7 +455,7 @@ void cutSelection(LCursor & cur, bool doclear, bool realcut) bp.textclass); } - boost::tie(endpit, endpos) = + boost::tie(endpit, endpos) = eraseSelectionHelper(bp, text->paragraphs(), begpit, endpit, diff --git a/src/cursor.C b/src/cursor.C index 82bfc82d6a..0339843e9d 100644 --- a/src/cursor.C +++ b/src/cursor.C @@ -390,7 +390,7 @@ void LCursor::selHandle(bool sel) // noUpdate(); return; } - + resetAnchor(); selection() = sel; } @@ -718,7 +718,7 @@ void LCursor::macroModeClose() if (macro && macro->getInsetName() == name) lyxerr << "can't enter recursive macro" << endl; - niceInsert(createMathInset(name)); + niceInsert(createMathInset(name)); } diff --git a/src/factory.C b/src/factory.C index 3d478132f0..42a61848c4 100644 --- a/src/factory.C +++ b/src/factory.C @@ -469,8 +469,8 @@ InsetBase * readInset(LyXLex & lex, Buffer const & buf) } inset->read(buf, lex); - -#warning hack.. + +#warning hack.. if (inset->lyxCode() == InsetBase::MATHMACRO_CODE) { MathMacroTemplate const * tmpl = static_cast(inset.get()); diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index 33ff341bc5..abd5a264ab 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -13,7 +13,7 @@ * Painter.[Ch]: remove Painter & return value everywhere, make virtual all remaining nonvirtual methods - + * nullpainter.[Ch]: add no-op painter 2004-04-05 Angus Leeming @@ -83,7 +83,7 @@ * screen.[Ch] (fitCursor): use LCursor::getDim, simplify (fitManualCursor): remove (topCursorVisible): remove - + 2003-11-11 Alfredo Braunstein @@ -91,7 +91,7 @@ 2003-11-10 André Pönitz - * screen.C: adjust to removed inset locking + * screen.C: adjust to removed inset locking 2003-10-14 Angus Leeming diff --git a/src/frontends/controllers/ButtonPolicies.C b/src/frontends/controllers/ButtonPolicies.C index 1b5e2ca9cc..e077364a7e 100644 --- a/src/frontends/controllers/ButtonPolicies.C +++ b/src/frontends/controllers/ButtonPolicies.C @@ -19,7 +19,7 @@ using std::string; namespace { -string const printState(ButtonPolicy::State const & state) +string const printState(ButtonPolicy::State const & state) { string output; diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index eb8aa9dd8a..367742ba59 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -5,7 +5,7 @@ 2004-04-07 Martin Vermeer * ControlDocument.C: 'assign' for opening/closing branch insets - according to selection + according to selection 2004-04-05 Angus Leeming @@ -15,7 +15,7 @@ state machine on receipt of SMI_CANCEL/SMI_HIDE if the existing state is APPLIED, then let this state persist. Next time that the dialog is opened, the user will be able to press 'Save'. - + 2004-04-05 Angus Leeming * ControlPrefs.C (dispatchParams): ignore system_lyxrc when writing diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog index ae250f8e97..4db0e39d7f 100644 --- a/src/frontends/gtk/ChangeLog +++ b/src/frontends/gtk/ChangeLog @@ -83,19 +83,19 @@ 2004-02-07 Huang Ying - * GViewBase.C : add addCancel, addOK, addApply, add Restore to + * GViewBase.C : add addCancel, addOK, addApply, add Restore to facilitate setup buttons signal. * GAboutLyx.C : using addxxx series functions. * GTableCreate.C : using addxxx series functions. * GText.C : using addxxx series functions. * GUrl.C : using addxxx series functions. - + 2004-02-02 Huang Ying - * GAboutLyx.C : the "CREDITS" is in "ISO8859-1" charset not locale + * GAboutLyx.C : the "CREDITS" is in "ISO8859-1" charset not locale charset, so change the convert function from Glib::locale_to_utf8 to Glib::convert(credit, "UTF-8", "ISO8859-1"). - + 2003-12-20 Jürgen Spitzmüller * Dialogs.C: @@ -112,7 +112,7 @@ fronetends to prevent layouts widget from disable always. 2003-10-28 Huang Ying - + * codeConvert.h (etc): Change FcChar to XftChar according to the libxft interface changing. * FileDialogPrivate.C : get rid of button support in FileDialog diff --git a/src/frontends/nullpainter.h b/src/frontends/nullpainter.h index 821a3543d9..5b5ae13b25 100644 --- a/src/frontends/nullpainter.h +++ b/src/frontends/nullpainter.h @@ -21,7 +21,7 @@ class NullPainter : public Painter { public: /// NullPainter() {} - + virtual ~NullPainter() {} /// begin painting @@ -29,11 +29,11 @@ public: /// end painting void end() {} - /// + /// int paperWidth() const { return 0; } - /// + /// int paperHeight() const; - + /// void line(int, int, int, int, LColor_color, line_style = line_solid, line_width = line_thin) {} @@ -43,20 +43,20 @@ public: /// void rectangle(int, int, int, int, LColor_color, line_style = line_solid, line_width = line_thin) {} - /// + /// void fillRectangle(int, int, int, int, LColor_color) {} - /// + /// void fillPolygon(int const *, int const *, int, LColor_color) {} - /// + /// void arc(int, int, unsigned int, unsigned int, int, int, LColor_color) {} - /// + /// void point(int, int, LColor_color) {} - /// + /// void button(int, int, int, int) {} - /// + /// void image(int, int, int, int, lyx::graphics::Image const &) {} - /// + /// void text(int, int, std::string const &, LyXFont const &) {} /// void text(int, int, char const *, size_t, LyXFont const &) {} diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index eabf3c3279..7c0e106948 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -48,7 +48,7 @@ 2004-04-01 Jürgen Spitzmüller - * floatplacement.[Ch]: correct fix for enabling of placement + * floatplacement.[Ch]: correct fix for enabling of placement values (bug 1016) 2004-03-31 Angus Leeming @@ -96,11 +96,11 @@ * QDocument.C: * QDocumentDialog.C: * ui/BiblioModuleBase.ui: bibtopic support. - + * QPrefs.C: * QPrefsDialog.C: * ui/QPrefsLaTeXModule.ui: customize bibtex call. - + * QFloat.C: * QFloatDialog.C: * floatplacement.[Ch]: add support for sidewaysfloats @@ -139,10 +139,10 @@ * QCitation.C: * ui/QCitationDialogBase.ui: Support second \cite option. - + * QDocumentDialog.C (branches): Don't deselect branch after button press. - * QBranch.C: fix off-by-one-error. + * QBranch.C: fix off-by-one-error. 2004-02-21 Georg Baum @@ -152,8 +152,8 @@ 2004-02-20 Jürgen Spitzmüller * QDocument.C: - * QDocumentDialog.C: - * ui/LanguageModuleBase.ui: get rid of the single/double + * QDocumentDialog.C: + * ui/LanguageModuleBase.ui: get rid of the single/double quote toggle (accessible via lfuns now). 2004-02-19 Jürgen Spitzmüller @@ -164,11 +164,11 @@ 2004-02-18 Jürgen Spitzmüller * QCitation.[Ch]: - * QCitationDialog.[Ch]: open the find dialog if an inset is + * QCitationDialog.[Ch]: open the find dialog if an inset is new (new method openFind()). Fixes bug 1146. - + * QCitation.C: restore the chosen natbib style. - + * QRef.C: Disable goto button if there is no ref (bug 1037) Restore setting of the buffer combo (bug 1511) diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C index bce074e77f..f1c7b80320 100644 --- a/src/frontends/qt2/QPrefs.C +++ b/src/frontends/qt2/QPrefs.C @@ -192,7 +192,7 @@ void QPrefs::apply() rc.preview = LyXRC::PREVIEW_ON; break; } - + lyx::graphics::DisplayType dtype(lyx::graphics::ColorDisplay); switch (displaymod->displayGraphicsCO->currentItem()) { @@ -511,7 +511,7 @@ void QPrefs::update_contents() displaymod->instantPreviewCO->setCurrentItem(2); break; } - + int item = 2; switch (rc.display_graphics) { diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 07875810ca..81fd9b2037 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -83,10 +83,10 @@ * FormDocument.[Ch]: * forms/form_bibtex.fd: bibtopic support. * forms/form_document.fd: radio default/natbib/jurabib. - + * FormPreferences.C: * forms/form_preferences.fd: customize bibtex call. - + * FormFloat.C: * forms/form_float.fd: add support for sidewaysfloats @@ -111,7 +111,7 @@ 2004-03-26 Jean-Marc Lasgouttes * XLyXKeySym.C (print): new method; print a keysym using - kb_keymap::printKeySym. + kb_keymap::printKeySym. 2004-03-17 Angus Leeming @@ -140,7 +140,7 @@ 2004-02-20 Jürgen Spitzmüller * FormDocument.C: - * forms/form_document.fd: get rid of the single/double + * forms/form_document.fd: get rid of the single/double quote toggle (accessible via lfuns now). 2004-02-01 Lars Gullik Bjonnes diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C index 2d4f5e9359..61d177d2c2 100644 --- a/src/frontends/xforms/FormPreferences.C +++ b/src/frontends/xforms/FormPreferences.C @@ -1619,7 +1619,7 @@ void FormPreferences::LnFmisc::apply(LyXRC & rc) const rc.preview = LyXRC::PREVIEW_ON; break; } - + rc.autosave = static_cast (fl_get_counter_value(dialog_->counter_autosave)); rc.wheel_jump = static_cast diff --git a/src/frontends/xforms/forms/README b/src/frontends/xforms/forms/README index 553eed2697..c4e075ec66 100644 --- a/src/frontends/xforms/forms/README +++ b/src/frontends/xforms/forms/README @@ -1,7 +1,7 @@ All .fd files go in this directory. Each .fd file should have just one form in them -NOTE: An exception to the above is any tabbed form which +NOTE: An exception to the above is any tabbed form which xforms requires multiple forms to create. In that case the group of forms constitutes one gui form. diff --git a/src/frontends/xforms/forms/fdfixc.sed b/src/frontends/xforms/forms/fdfixc.sed index 7137e3556f..e9780b0ea7 100644 --- a/src/frontends/xforms/forms/fdfixc.sed +++ b/src/frontends/xforms/forms/fdfixc.sed @@ -97,7 +97,7 @@ s/CHOICE/COMBOX/ /fl_/ s/".[^|]*"/_(&).c_str()/ -# For all lines containing "_shortcut" and a string containing |, +# For all lines containing "_shortcut" and a string containing |, # replace the string with scex(_(string)).c_str() /_shortcut/ s/".*[|].*"/scex(_(&)).c_str()/ diff --git a/src/frontends/xforms/forms/fdfixh.sed b/src/frontends/xforms/forms/fdfixh.sed index 6634d9703e..fa17837069 100644 --- a/src/frontends/xforms/forms/fdfixh.sed +++ b/src/frontends/xforms/forms/fdfixh.sed @@ -56,13 +56,13 @@ s/extern \(.*\) create_form_form_\(.*\)[(]void[)]/\1 build_\2(void *)/ # typedef struct { struct FD_xxx : public FD_base { # FL_FORM *form_xxx; FL_OBJECT * some_obj; # void *vdata; ... -# char *cdata; }; +# char *cdata; }; # long ldata; # FL_OBJECT *some_obj; # ... # } FD_xxx; # -# This is detailed more closely below +# This is detailed more closely below # We retain only those lines in the struct that start " FL_OBJECT *", # placing them in the hold space until the end of the struct is reached diff --git a/src/insets/insetbase.C b/src/insets/insetbase.C index f4f637e0a4..cf7e3604c3 100644 --- a/src/insets/insetbase.C +++ b/src/insets/insetbase.C @@ -287,7 +287,7 @@ bool InsetBase::editing(BufferView * bv) const bool InsetBase::covers(int x, int y) const { - //lyxerr << "InsetBase::covers, x: " << x << " y: " << y + //lyxerr << "InsetBase::covers, x: " << x << " y: " << y // << " xo: " << xo() << " yo: " << yo() // << " x1: " << xo() << " x2: " << xo() + width() // << " y1: " << yo() - ascent() << " y2: " << yo() + descent() diff --git a/src/insets/render_graphic.C b/src/insets/render_graphic.C index 5a75c3d06a..31d4605b11 100644 --- a/src/insets/render_graphic.C +++ b/src/insets/render_graphic.C @@ -80,7 +80,7 @@ bool displayGraphic(graphics::Params const & params) return params.display != graphics::NoDisplay && lyxrc.display_graphics != graphics::NoDisplay; } - + string const statusMessage(graphics::Params const & params, graphics::ImageStatus status) diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 3fa0f222ca..42d09b4fbc 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -588,7 +588,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd, bool verbose) selection_possible = false; bool update = true; - + // We cannot use this function here if (!getStatus(cmd).enabled()) { lyxerr[Debug::ACTION] << "LyXFunc::dispatch: " @@ -1371,7 +1371,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd, bool verbose) update |= res.update(); else update |= view()->dispatch(cmd); - + break; } } diff --git a/src/lyxlength.C b/src/lyxlength.C index c461efd475..8ca0118783 100644 --- a/src/lyxlength.C +++ b/src/lyxlength.C @@ -64,20 +64,20 @@ string const LyXLength::asLatexString() const switch (unit_) { case PTW: snprintf(buffer, 78, "%.2f\\textwidth", val_/100.0); - break; - case PCW: + break; + case PCW: snprintf(buffer, 78, "%.2f\\columnwidth", val_/100.0); - break; - case PPW: + break; + case PPW: snprintf(buffer, 78, "%.2f\\paperwidth", val_/100.0); - break; - case PLW: + break; + case PLW: snprintf(buffer, 78, "%.2f\\linewidth", val_/100.0); - break; - case PPH: + break; + case PPH: snprintf(buffer, 78, "%.2f\\paperheight", val_/100.0); - break; - case PTH: + break; + case PTH: snprintf(buffer, 78, "%.2f\\textheight", val_/100.0); break; default: diff --git a/src/lyxrc.C b/src/lyxrc.C index f79b9e679c..f62f7a0ff0 100644 --- a/src/lyxrc.C +++ b/src/lyxrc.C @@ -787,9 +787,9 @@ int LyXRC::read(LyXLex & lexrc) break; } - LColor::color const col = + LColor::color const col = lcolor.getFromLyXName(lyx_name); - if (col == LColor::none || + if (col == LColor::none || col == LColor::inherit || col == LColor::ignore) break; diff --git a/src/mathed/README b/src/mathed/README index f160b137e1..788181b361 100644 --- a/src/mathed/README +++ b/src/mathed/README @@ -16,7 +16,7 @@ Inset hierarchy: / \ - Nest Dots, Func, ... + Nest Dots, Func, ... (for thing with nested content) diff --git a/src/mathed/math_data.C b/src/mathed/math_data.C index b9e3e43d5a..c2b6e60346 100644 --- a/src/mathed/math_data.C +++ b/src/mathed/math_data.C @@ -220,7 +220,7 @@ void MathArray::metrics(MetricsInfo & mi, Dimension & dim) const namespace { -bool isInside(DocIterator const & it, MathArray const & ar, +bool isInside(DocIterator const & it, MathArray const & ar, lyx::pos_type p1, lyx::pos_type p2) { for (size_t i = 0; i != it.size(); ++i) { diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C index e4d35dd53f..168dc625b2 100644 --- a/src/mathed/math_gridinset.C +++ b/src/mathed/math_gridinset.C @@ -1027,7 +1027,7 @@ void MathGridInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) // insert file functions case LFUN_DELETE_LINE_FORWARD: - recordUndo(cur); + recordUndo(cur); //autocorrect_ = false; //macroModeClose(); //if (selection_) { @@ -1043,12 +1043,12 @@ void MathGridInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) break; case LFUN_CELL_SPLIT: - recordUndo(cur); + recordUndo(cur); splitCell(cur); break; case LFUN_BREAKLINE: { - recordUndo(cur); + recordUndo(cur); row_type const r = cur.row(); addRow(r); @@ -1069,7 +1069,7 @@ void MathGridInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) } case LFUN_TABULAR_FEATURE: { - recordUndo(cur); + recordUndo(cur); //lyxerr << "handling tabular-feature " << cmd.argument << endl; istringstream is(cmd.argument); string s; @@ -1129,7 +1129,7 @@ void MathGridInset::priv_dispatch(LCursor & cur, FuncRequest & cmd) } case LFUN_PASTE: { - recordUndo(cur); + recordUndo(cur); lyxerr << "MathGridInset: PASTE: " << cmd << std::endl; istringstream is(cmd.argument); int n = 0; diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h index 8056c99175..28a184aa68 100644 --- a/src/mathed/math_macro.h +++ b/src/mathed/math_macro.h @@ -56,7 +56,7 @@ private: void updateExpansion() const; /// void expand() const; - + /// name of macro std::string name_; /// the unexpanded macro defintition diff --git a/src/mathed/math_macrotable.C b/src/mathed/math_macrotable.C index fe5d668965..001b64e3ae 100644 --- a/src/mathed/math_macrotable.C +++ b/src/mathed/math_macrotable.C @@ -31,7 +31,7 @@ using std::string; using std::vector; -MacroData::MacroData() +MacroData::MacroData() : numargs_(0) {} diff --git a/src/mathed/math_macrotable.h b/src/mathed/math_macrotable.h index 8f5abfb57e..4deb1cfde1 100644 --- a/src/mathed/math_macrotable.h +++ b/src/mathed/math_macrotable.h @@ -37,7 +37,7 @@ public: private: /// - std::string def_; + std::string def_; /// int numargs_; /// diff --git a/src/rowpainter.C b/src/rowpainter.C index 4b7cc545ea..3b703b58d4 100644 --- a/src/rowpainter.C +++ b/src/rowpainter.C @@ -878,7 +878,7 @@ int paintPars(BufferView const & bv, Painter & pain, void refreshPar(BufferView const & bv, LyXText const & text, par_type pit) { - + static NullPainter nop; paintPars(bv, nop, text, pit, pit + 1); } diff --git a/src/support/ChangeLog b/src/support/ChangeLog index 1642871fe8..01dafe8de7 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -30,7 +30,7 @@ exception. * forkedcontr.C: make it a little more robust. - + 2004-03-24 Angus Leeming * forkedcontr.[Ch]: get rid of the timer that we use to poll the list diff --git a/src/support/filetools.C b/src/support/filetools.C index 37afe9116e..fe020bdac9 100644 --- a/src/support/filetools.C +++ b/src/support/filetools.C @@ -1176,7 +1176,7 @@ cmd_ret const RunCommand(string const & cmd) // FIXME: replace all calls to RunCommand with ForkedCall // (if the output is not needed) or the code in ispell.C // (if the output is needed). - + // One question is if we should use popen or // create our own popen based on fork, exec, pipe // of course the best would be to have a @@ -1190,7 +1190,7 @@ cmd_ret const RunCommand(string const & cmd) // Block the SIGCHLD signal. sigprocmask(SIG_BLOCK, &newMask, &oldMask); - + FILE * inf = ::popen(cmd.c_str(), os::popen_read_mode()); // (Claus Hentschel) Check if popen was succesful ;-) diff --git a/src/support/path_defines.C.in b/src/support/path_defines.C.in index b746ec7387..7cc73345ac 100644 --- a/src/support/path_defines.C.in +++ b/src/support/path_defines.C.in @@ -190,7 +190,7 @@ bool setLyxPaths() } // Path of binary/../Resources/ - searchpath += NormalizePath(AddPath(binpath, "../Resources/") + + searchpath += NormalizePath(AddPath(binpath, "../Resources/") + OnlyFilename(binname)) + ';'; string fullbinpath = binpath; @@ -288,7 +288,7 @@ bool setLyxPaths() << system_lyxdir_ << '\'' << endl; // - // Set PATH for LyX/Mac + // Set PATH for LyX/Mac // LyX/Mac is a relocatable application bundle; here we add to // the PATH so it can find binaries like reLyX inside its own // application bundle, and also append PATH elements that it