From: Angus Leeming Date: Mon, 13 Oct 2003 09:43:15 +0000 (+0000) Subject: No trailing whitespace left in src... X-Git-Tag: 1.6.10~15962 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=18b220ac99c8813da5ba8f78dc30ccc18582b056;p=features.git No trailing whitespace left in src... git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7904 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/frontends/controllers/ControlBox.C b/src/frontends/controllers/ControlBox.C index 93e4de9582..9c9e7e0ea6 100644 --- a/src/frontends/controllers/ControlBox.C +++ b/src/frontends/controllers/ControlBox.C @@ -52,7 +52,7 @@ void ControlBox::dispatchParams() void box_gui_tokens(vector & ids, vector & gui_names) { char const * const ids_[] = { - "Frameless", "Boxed", "ovalbox", + "Frameless", "Boxed", "ovalbox", "Ovalbox", "Shadowbox", "Doublebox"}; size_t const ids_size = sizeof(ids_) / sizeof(char *); ids = vector(ids_, ids_ + ids_size); @@ -65,11 +65,11 @@ void box_gui_tokens(vector & ids, vector & gui_names) gui_names.push_back(_("Double box")); } -void box_gui_tokens_special_length(vector & ids, +void box_gui_tokens_special_length(vector & ids, vector & gui_names) { char const * const ids_[] = { - "none", "height", "depth", + "none", "height", "depth", "totalheight", "width"}; size_t const ids_size = sizeof(ids_) / sizeof(char *); ids = vector(ids_, ids_ + ids_size); diff --git a/src/frontends/controllers/ControlBox.h b/src/frontends/controllers/ControlBox.h index 8d9dd97c48..3a3dc33dff 100644 --- a/src/frontends/controllers/ControlBox.h +++ b/src/frontends/controllers/ControlBox.h @@ -43,7 +43,7 @@ private: /// void box_gui_tokens(std::vector &, std::vector &); /// -void box_gui_tokens_special_length(std::vector &, +void box_gui_tokens_special_length(std::vector &, std::vector &); #endif // CONTROLBOX_H diff --git a/src/frontends/gnome/accessors.py b/src/frontends/gnome/accessors.py index 008df5c475..70b771cc09 100644 --- a/src/frontends/gnome/accessors.py +++ b/src/frontends/gnome/accessors.py @@ -18,7 +18,7 @@ def cppClass(gladeClass): return "Gtk::" + gladeClass[3:] elif gnome.search(gladeClass): return "Gnome::" + gladeClass[5:] - + class widget: def __init__(self, clss, name): self.clss = cppClass(clss) @@ -27,7 +27,7 @@ class widget: def getAccessor(self): function = "" function += self.clss + " * " + dialog +"::" + self.name - function += "() const \n{\n return getWidget<" + self.clss + function += "() const \n{\n return getWidget<" + self.clss function += ">(\"" + "r_" + self.name + "\");\n}\n" return function @@ -47,17 +47,17 @@ class GnomeFrontendHandler(ContentHandler): self.elemstack = [] self.widget = 0 self.TODO = [] - + def startElement(self, name, attrs): self.elemstack.append(name) if name == "widget" and rn.search(attrs["id"]): - self.TODO.append(widget(attrs["class"], + self.TODO.append(widget(attrs["class"], re.sub("^r_", "", attrs["id"]))) - + def endElement(self, name): self.elemstack.pop() - + def characters(self, data): elem = self.elemstack[-1] @@ -97,7 +97,7 @@ for i in hndlr.widgets(): dotH.close() - - + + diff --git a/src/frontends/xforms/Dialogs.C b/src/frontends/xforms/Dialogs.C index 71ee5280de..776e6d8ba2 100644 --- a/src/frontends/xforms/Dialogs.C +++ b/src/frontends/xforms/Dialogs.C @@ -111,7 +111,7 @@ FormMathsBitmap * createFormBitmap(Dialog & parent, string const & title, } -char const * const dialognames[] = { +char const * const dialognames[] = { "aboutlyx", "bibitem", "bibtex", "branch", "box", "changes", "character", "citation", "error", "errorlist" , "ert", "external", "file", "float", "graphics", "include", "index", "label", "latexlog", "mathpanel", diff --git a/src/frontends/xforms/FormBox.C b/src/frontends/xforms/FormBox.C index 333e6cd927..baf8f19ef9 100644 --- a/src/frontends/xforms/FormBox.C +++ b/src/frontends/xforms/FormBox.C @@ -97,19 +97,19 @@ void FormBox::build() } string choice = getStringFromVector(getLatexUnits(), "|"); - fl_addto_choice(dialog_->choice_width_unit, + fl_addto_choice(dialog_->choice_width_unit, subst(choice, "%", "%%").c_str()); bcview().addReadOnly(dialog_->input_height); bcview().addReadOnly(dialog_->choice_height_unit); bcview().addReadOnly(dialog_->choice_height_special); for (unsigned int i = 0; i < gui_names_spec_.size(); ++i) { - fl_addto_choice(dialog_->choice_height_special, + fl_addto_choice(dialog_->choice_height_special, gui_names_spec_[i].c_str()); } choice = getStringFromVector(getLatexUnits(), "|"); - fl_addto_choice(dialog_->choice_height_unit, + fl_addto_choice(dialog_->choice_height_unit, subst(choice, "%", "%%").c_str()); bcview().setOK(dialog_->button_ok); @@ -151,7 +151,7 @@ void FormBox::update() string special(controller().params().special); for (unsigned int i = 0; i < gui_names_spec_.size(); ++i) { if (special == ids_spec_[i]) - fl_set_choice_text(dialog_->choice_special, + fl_set_choice_text(dialog_->choice_special, gui_names_spec_[i].c_str()); } // Special width unit must be default for general units to be enabled @@ -165,7 +165,7 @@ void FormBox::update() string const height_special(controller().params().height_special); for (unsigned int i = 0; i < gui_names_spec_.size(); ++i) { if (height_special == ids_spec_[i]) - fl_set_choice_text(dialog_->choice_height_special, + fl_set_choice_text(dialog_->choice_height_special, gui_names_spec_[i].c_str()); } setEnabled(dialog_->input_height, controller().params().inner_box); @@ -183,46 +183,46 @@ void FormBox::apply() controller().params().type = ids_[i - 1]; controller().params().inner_box = fl_get_button(dialog_->check_inner_box); - controller().params().use_parbox = + controller().params().use_parbox = fl_get_button(dialog_->radio_parbox); controller().params().width = LyXLength(getLengthFromWidgets(dialog_->input_width, dialog_->choice_width_unit)); - + controller().params().pos = "tcb"[fl_get_choice(dialog_->choice_pos) - 1]; controller().params().inner_pos = "tcbs"[fl_get_choice(dialog_->choice_inner_pos) - 1]; controller().params().hor_pos = "lcrs"[fl_get_choice(dialog_->choice_hor_pos) - 1]; - - i = fl_get_choice(dialog_->choice_special); + + i = fl_get_choice(dialog_->choice_special); controller().params().special = ids_spec_[i - 1]; - + controller().params().height = LyXLength(getLengthFromWidgets(dialog_->input_height, dialog_->choice_height_unit)); - i = fl_get_choice(dialog_->choice_height_special); + i = fl_get_choice(dialog_->choice_height_special); controller().params().height_special = ids_spec_[i - 1]; } ButtonPolicy::SMInput FormBox::input(FL_OBJECT * ob, long) { if (ob == dialog_->check_inner_box) { - setEnabled(dialog_->choice_pos, + setEnabled(dialog_->choice_pos, fl_get_button(dialog_->check_inner_box)); - setEnabled(dialog_->radio_parbox, + setEnabled(dialog_->radio_parbox, fl_get_button(dialog_->check_inner_box)); - setEnabled(dialog_->radio_minipage, + setEnabled(dialog_->radio_minipage, fl_get_button(dialog_->check_inner_box)); setEnabled(dialog_->choice_width_unit, true); - setEnabled(dialog_->choice_special, + setEnabled(dialog_->choice_special, !fl_get_button(dialog_->check_inner_box)); setEnabled(dialog_->input_height, fl_get_button(dialog_->check_inner_box)); setEnabled(dialog_->choice_height_unit, fl_get_button(dialog_->check_inner_box)); - setEnabled(dialog_->choice_height_special, + setEnabled(dialog_->choice_height_special, fl_get_button(dialog_->check_inner_box)); setEnabled(dialog_->choice_hor_pos, !fl_get_button(dialog_->check_inner_box)); @@ -237,15 +237,15 @@ ButtonPolicy::SMInput FormBox::input(FL_OBJECT * ob, long) } if (ob == dialog_->choice_special || ob == dialog_->check_inner_box) - setEnabled(dialog_->choice_width_unit, + setEnabled(dialog_->choice_width_unit, fl_get_choice(dialog_->choice_special) == NONE); if (ob == dialog_->choice_height_special || ob == dialog_->check_inner_box) if (fl_get_choice(dialog_->choice_height_special) != NONE) setEnabled(dialog_->choice_height_unit, false); else - setEnabled(dialog_->choice_height_unit, + setEnabled(dialog_->choice_height_unit, fl_get_button(dialog_->check_inner_box)); - + // An inner box (parbox, minipage) is mandatory if no outer box if (ob == dialog_->choice_type) { int i = fl_get_choice(dialog_->choice_type); @@ -263,7 +263,7 @@ ButtonPolicy::SMInput FormBox::input(FL_OBJECT * ob, long) if (invalid) { postWarning(_("Invalid Length!")); return ButtonPolicy::SMI_INVALID; - } + } } if (ob == dialog_->input_height) { string const input = getString(dialog_->input_height); @@ -271,10 +271,10 @@ ButtonPolicy::SMInput FormBox::input(FL_OBJECT * ob, long) if (invalid) { postWarning(_("Invalid Length!")); return ButtonPolicy::SMI_INVALID; - } + } } if (ob == dialog_->button_defaults) { - fl_set_button(dialog_->check_inner_box, true); + fl_set_button(dialog_->check_inner_box, true); fl_set_button(dialog_->radio_parbox, false); fl_set_input(dialog_->input_width, "100"); fl_set_choice(dialog_->choice_width_unit, LyXLength::PCW + 1); @@ -282,7 +282,7 @@ ButtonPolicy::SMInput FormBox::input(FL_OBJECT * ob, long) fl_set_input(dialog_->input_height, "1"); fl_set_choice(dialog_->choice_height_special, TOTALHEIGHT); } - + return ButtonPolicy::SMI_VALID; } diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog index af9da700c3..271fb6661e 100644 --- a/src/graphics/ChangeLog +++ b/src/graphics/ChangeLog @@ -25,7 +25,7 @@ 2003-10-07 Martin Vermeer - * GraphicsCache.h: + * GraphicsCache.h: * PreviewImage.h: add and other small fixes to make Lars' std::string patch compile with STLport. diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index b4bb50ed24..1b964ee613 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -4,7 +4,7 @@ * ExternalTransforms.C: * insetbox.C: * insetbox.h: ws changes only - + 2003-10-13 Lars Gullik Bjønnes * insetinclude.C (localDispatch): do not call diff --git a/src/mathed/math_boldsymbolinset.h b/src/mathed/math_boldsymbolinset.h index f44dbb808b..489a122345 100644 --- a/src/mathed/math_boldsymbolinset.h +++ b/src/mathed/math_boldsymbolinset.h @@ -15,7 +15,7 @@ #include "math_nestinset.h" -/// Inset for AMSTeX's \boldsymbol +/// Inset for AMSTeX's \boldsymbol class MathBoldsymbolInset : public MathNestInset { public: /// diff --git a/src/support/types.h b/src/support/types.h index 53a4e19e8d..d1a308a3b8 100644 --- a/src/support/types.h +++ b/src/support/types.h @@ -25,7 +25,7 @@ namespace lyx // used there... typedef ptrdiff_t pos_type; - /// a type for paragraph offsets + /// a type for paragraph offsets typedef ptrdiff_t paroffset_type; /// a type for the nesting depth of a paragraph diff --git a/src/tabular.h b/src/tabular.h index 2775ad6d27..ea50c3cf90 100644 --- a/src/tabular.h +++ b/src/tabular.h @@ -366,7 +366,7 @@ public: /// InsetText & getCellInset(int row, int column) const; /// Search for \param inset in the tabular, with the - /// + /// int getCellFromInset(InsetOld const * inset) const; /// int rows() const { return rows_; }