From 68b0cca2e701e4959ffb4754184b9b28110b8e7f Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Fri, 26 Nov 2004 14:52:54 +0000 Subject: [PATCH] Whitespace, only whitespace. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9314 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/Toolbars.C | 4 ++-- src/frontends/controllers/ChangeLog | 2 +- src/frontends/controllers/ControlSpellchecker.C | 14 +++++++------- src/frontends/gtk/ChangeLog | 4 ++-- src/frontends/gtk/GBox.C | 2 +- src/frontends/qt2/ChangeLog | 2 +- src/frontends/qt2/QPrefsDialog.C | 12 ++++++------ src/frontends/qt2/QVSpace.C | 2 +- src/frontends/qt2/QVSpaceDialog.C | 2 +- src/frontends/qt2/lengthvalidator.C | 2 +- src/funcrequest.C | 6 +++--- src/funcrequest.h | 12 ++++++------ src/output_latex.C | 8 ++++---- src/paragraph_funcs.C | 4 ++-- src/sgml.C | 4 ++-- src/undo.C | 4 ++-- src/undo.h | 4 ++-- 17 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/frontends/Toolbars.C b/src/frontends/Toolbars.C index 4cea988e91..344c2248fe 100644 --- a/src/frontends/Toolbars.C +++ b/src/frontends/Toolbars.C @@ -167,13 +167,13 @@ void layoutSelected(LyXView & lv, string const & name) string const & itname = (*it)->name(); // Yes, the _() is correct if (_(itname) == name) { - FuncRequest const func(LFUN_LAYOUT, itname, + FuncRequest const func(LFUN_LAYOUT, itname, FuncRequest::UI); lv.getLyXFunc().dispatch(func); return; } } - lyxerr << "ERROR (layoutSelected): layout not found!" + lyxerr << "ERROR (layoutSelected): layout not found!" << endl; } diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 572535bab0..8bfb5ff33c 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -31,7 +31,7 @@ 2004-11-05 Jean-Marc Lasgouttes - * ControlRef.C (gotoRef, gotoBookmark): + * ControlRef.C (gotoRef, gotoBookmark): * Kernel.C (dispatch): remove verbose argument * ControlCommandBuffer.C (dispatch): set origin of the lfun to diff --git a/src/frontends/controllers/ControlSpellchecker.C b/src/frontends/controllers/ControlSpellchecker.C index 0321b166dc..5bead7bb7d 100644 --- a/src/frontends/controllers/ControlSpellchecker.C +++ b/src/frontends/controllers/ControlSpellchecker.C @@ -123,9 +123,9 @@ bool isLetter(DocIterator const & cur) return cur.inTexted() && cur.inset().allowSpellCheck() && cur.pos() != cur.lastpos() - && (cur.paragraph().isLetter(cur.pos()) + && (cur.paragraph().isLetter(cur.pos()) // We want to pass the ' and escape chars to ispell - || contains(lyxrc.isp_esc_chars + '\'', + || contains(lyxrc.isp_esc_chars + '\'', cur.paragraph().getChar(cur.pos()))) && !isDeletedText(cur.paragraph(), cur.pos()); } @@ -147,22 +147,22 @@ WordLangTuple nextWord(DocIterator & cur, ptrdiff_t & progress, lang_code = cur.paragraph().getFontSettings(bp, cur.pos()).language()->code(); } // Insets like optional hyphens and ligature - // break are part of a word. + // break are part of a word. if (!cur.paragraph().isInset(cur.pos())) { - Paragraph::value_type const c = + Paragraph::value_type const c = cur.paragraph().getChar(cur.pos()); word += c; if (IsDigit(c)) ignoreword = true; - } + } } else { // !isLetter(cur) - if (inword) + if (inword) if (!ignoreword) return WordLangTuple(word, lang_code); else inword = false; } - + cur.forwardPos(); ++progress; } diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog index fbbd5e5a33..00993d871b 100644 --- a/src/frontends/gtk/ChangeLog +++ b/src/frontends/gtk/ChangeLog @@ -13,14 +13,14 @@ * GSendto.C: Disable concept checks (see below) 2004-11-21 John Spray - + * The Sendto Dialog: Dialogs.C, Makefile.am, GSendto.C, GSendto.h 2004-11-17 Lars Gullik Bjonnes * Disable concept checks with the use of ugly preprocessor stuff - in several files. + in several files. 2004-11-15 Jean-Marc Lasgouttes diff --git a/src/frontends/gtk/GBox.C b/src/frontends/gtk/GBox.C index a1cd1b3412..4d5e95b593 100644 --- a/src/frontends/gtk/GBox.C +++ b/src/frontends/gtk/GBox.C @@ -178,7 +178,7 @@ void GBox::update() if (special == ids_spec_[i]) spc = gui_names_spec_[i]; } - for (size_t j = 0; j + for (size_t j = 0; j < widthunitsstore_->children().size(); ++j) { if (widthunitsstore_->children()[j][stringcol_] == spc) widthunitscombo_->set_active(j); diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index f5ab8852f2..c650872328 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -13,7 +13,7 @@ * lengthvalidator.[Ch]: add GlueLength validator * QVSpace.C: * QVSpaceDialog.C: use GlueLength validator - + * lengthcombo.C: whitespace 2004-11-17 Lars Gullik Bjonnes diff --git a/src/frontends/qt2/QPrefsDialog.C b/src/frontends/qt2/QPrefsDialog.C index 6cc4b52916..859fbeae45 100644 --- a/src/frontends/qt2/QPrefsDialog.C +++ b/src/frontends/qt2/QPrefsDialog.C @@ -316,7 +316,7 @@ void QPrefsDialog::updateConverters() Converters::const_iterator ccit = form_->converters().begin(); Converters::const_iterator cend = form_->converters().end(); for (; ccit != cend; ++ccit) { - std::string const name = ccit->From->prettyname() + " -> " + std::string const name = ccit->From->prettyname() + " -> " + ccit->To->prettyname(); convertmod->convertersLB->insertItem(toqstr(name)); } @@ -335,7 +335,7 @@ void QPrefsDialog::switch_converter(int nr) convertersModule->converterToCO->setCurrentItem(form_->formats().getNumber(c.to)); convertersModule->converterED->setText(toqstr(c.command)); convertersModule->converterFlagED->setText(toqstr(c.flags)); - + updateConverterButtons(); } @@ -354,18 +354,18 @@ void QPrefsDialog::updateConverterButtons() convertersModule->converterToCO->currentItem())); int const sel = form_->converters().getNumber(from.name(), to.name()); bool const known = !(sel < 0); - bool const valid = !(convertersModule->converterED->text().isEmpty() + bool const valid = !(convertersModule->converterED->text().isEmpty() || from.name() == to.name()); - + Converter const & c(form_->converters().get( convertersModule->convertersLB->currentItem())); string const old_command = c.command; string const old_flag = c.flags; string const new_command(fromqstr(convertersModule->converterED->text())); string const new_flag(fromqstr(convertersModule->converterFlagED->text())); - + bool modified = ((old_command != new_command) || (old_flag != new_flag)); - + convertersModule->converterModifyPB->setEnabled(valid && known && modified); convertersModule->converterNewPB->setEnabled(valid && !known); convertersModule->converterRemovePB->setEnabled(known); diff --git a/src/frontends/qt2/QVSpace.C b/src/frontends/qt2/QVSpace.C index 3c5f7a4734..d9b59c8345 100644 --- a/src/frontends/qt2/QVSpace.C +++ b/src/frontends/qt2/QVSpace.C @@ -153,7 +153,7 @@ void QVSpace::build_dialog() // initialize the length validator addCheckedLineEdit(bcview(), dialog_->valueLE, dialog_->valueL); - + // remove the %-items from the unit choice dialog_->unitCO->noPercents(); } diff --git a/src/frontends/qt2/QVSpaceDialog.C b/src/frontends/qt2/QVSpaceDialog.C index e121594ea4..39daee67c9 100644 --- a/src/frontends/qt2/QVSpaceDialog.C +++ b/src/frontends/qt2/QVSpaceDialog.C @@ -51,7 +51,7 @@ QVSpaceDialog::QVSpaceDialog(QVSpace * form) form_, SLOT(slotApply())); connect(closePB, SIGNAL(clicked()), form_, SLOT(slotClose())); - + valueLE->setValidator(unsignedLengthValidator(valueLE)); } diff --git a/src/frontends/qt2/lengthvalidator.C b/src/frontends/qt2/lengthvalidator.C index 458d0a4f7d..5197fa597b 100644 --- a/src/frontends/qt2/lengthvalidator.C +++ b/src/frontends/qt2/lengthvalidator.C @@ -40,7 +40,7 @@ QValidator::State LengthValidator::validate(QString & qtext, int &) const return (isValidGlueLength(text, &gl)) ? QValidator::Acceptable : QValidator::Intermediate; } - + LyXLength l; bool const valid_length = isValidLength(text, &l); if (!valid_length) diff --git a/src/funcrequest.C b/src/funcrequest.C index 3286d9329d..6a9b3fd9a1 100644 --- a/src/funcrequest.C +++ b/src/funcrequest.C @@ -24,7 +24,7 @@ using std::string; FuncRequest::FuncRequest(Origin o) - : action(LFUN_NOACTION), origin(o), x(0), y(0), + : action(LFUN_NOACTION), origin(o), x(0), y(0), button_(mouse_button::none) {} @@ -35,12 +35,12 @@ FuncRequest::FuncRequest(kb_action act, Origin o) FuncRequest::FuncRequest(kb_action act, string const & arg, Origin o) - : action(act), argument(arg), origin(o), x(0), y(0), + : action(act), argument(arg), origin(o), x(0), y(0), button_(mouse_button::none) {} -FuncRequest::FuncRequest(kb_action act, int ax, int ay, +FuncRequest::FuncRequest(kb_action act, int ax, int ay, mouse_button::state but, Origin o) : action(act), origin(o), x(ax), y(ay), button_(but) {} diff --git a/src/funcrequest.h b/src/funcrequest.h index 978eab20a9..355499992d 100644 --- a/src/funcrequest.h +++ b/src/funcrequest.h @@ -27,10 +27,10 @@ class FuncRequest { public: /// Where the request came from enum Origin { - INTERNAL, + INTERNAL, UI, // The menu or the toolbar KEYBOARD, // a keyboard binding - COMMANDBUFFER + COMMANDBUFFER }; /// just for putting these things in std::container @@ -38,13 +38,13 @@ public: /// actions without extra argument explicit FuncRequest(kb_action act, Origin o = INTERNAL); /// actions without extra argument - FuncRequest(kb_action act, int x, int y, mouse_button::state button, - Origin o = INTERNAL); + FuncRequest(kb_action act, int x, int y, mouse_button::state button, + Origin o = INTERNAL); /// actions with extra argument - FuncRequest(kb_action act, std::string const & arg, + FuncRequest(kb_action act, std::string const & arg, Origin o = INTERNAL); /// for changing requests a bit - FuncRequest(FuncRequest const & cmd, std::string const & arg, + FuncRequest(FuncRequest const & cmd, std::string const & arg, Origin o = INTERNAL); /// access to button diff --git a/src/output_latex.C b/src/output_latex.C index 6ad8377c49..3fb0fe5d3d 100644 --- a/src/output_latex.C +++ b/src/output_latex.C @@ -195,16 +195,16 @@ TeXEnvironment(Buffer const & buf, } -int latexOptArgInsets(Buffer const & buf, Paragraph const & par, +int latexOptArgInsets(Buffer const & buf, Paragraph const & par, ostream & os, OutputParams const & runparams, int number) { int lines = 0; - + InsetList::const_iterator it = par.insetlist.begin(); InsetList::const_iterator end = par.insetlist.end(); for (; it != end && number > 0 ; ++it) { if (it->inset->lyxCode() == InsetBase::OPTARG_CODE) { - InsetOptArg * ins = + InsetOptArg * ins = static_cast(it->inset); lines += ins->latexOptional(buf, os, runparams); --number; @@ -313,7 +313,7 @@ TeXOnePar(Buffer const & buf, // Separate handling of optional argument inset. if (style->optionalargs > 0) { - int ret = latexOptArgInsets(buf, *pit, os, runparams, + int ret = latexOptArgInsets(buf, *pit, os, runparams, style->optionalargs); while (ret > 0) { texrow.newline(); diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C index 8816bb8da9..b3f87159a7 100644 --- a/src/paragraph_funcs.C +++ b/src/paragraph_funcs.C @@ -359,11 +359,11 @@ void getParsInRange(ParagraphList & pars, int ystart, int yend, int numberOfOptArgs(Paragraph const & par) { int num = 0; - + InsetList::const_iterator it = par.insetlist.begin(); InsetList::const_iterator end = par.insetlist.end(); for (; it != end ; ++it) { - if (it->inset->lyxCode() == InsetBase::OPTARG_CODE) + if (it->inset->lyxCode() == InsetBase::OPTARG_CODE) ++num; } return num; diff --git a/src/sgml.C b/src/sgml.C index 412fb8f127..9d159f4d7a 100644 --- a/src/sgml.C +++ b/src/sgml.C @@ -153,8 +153,8 @@ string cleanID(Buffer const & buf, OutputParams const & runparams, std::string c // make sure it starts with a letter if (!isalpha(*it) && allowed.find(*it) >= allowed.size()) content += "x"; - - bool mangle = false; + + bool mangle = false; for (; it != end; ++it) { char c = *it; if (isalpha(c) || isdigit(c) || c == '-' || c == '.' || allowed.find(c) < allowed.size()) diff --git a/src/undo.C b/src/undo.C index 567c41fb8b..4723b57b43 100644 --- a/src/undo.C +++ b/src/undo.C @@ -48,7 +48,7 @@ std::ostream & operator<<(std::ostream & os, Undo const & undo) void recordUndo(Undo::undo_kind kind, - DocIterator & cell, + DocIterator & cell, pit_type first_pit, pit_type last_pit, DocIterator & cur, limited_stack & stack) @@ -185,7 +185,7 @@ bool textUndoOrRedo(BufferView & bv, // If both places have the same depth we stay in the same // cell and store paragraphs from this cell. Otherwise we - // will drop slices from the more nested iterator and + // will drop slices from the more nested iterator and // create an undo item from a single paragraph of the common // ancestor. DocIterator ancestor_dit = cur_dit; diff --git a/src/undo.h b/src/undo.h index 136443a70a..69bc307f0d 100644 --- a/src/undo.h +++ b/src/undo.h @@ -45,7 +45,7 @@ structure ('Undo') _before_ it is changed in some edit operation. Obviously, the stored ranged should be as small as possible. However, it there is a lower limit: The StableDocIterator pointing stored in the undo struct must be valid after the changes, too, as it will used as a pointer -where to insert the stored bits when performining undo. +where to insert the stored bits when performining undo. */ @@ -70,7 +70,7 @@ struct Undo { undo_kind kind; /// the position of the cursor StableDocIterator cursor; - /// the position of the cell described + /// the position of the cell described StableDocIterator cell; /// counted from begin of cell lyx::pit_type from; -- 2.39.2