From 7ea7dabed1b72cc25dcbdc482ac006f2b61dacfd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sat, 16 Feb 2002 15:59:55 +0000 Subject: [PATCH] to much stuff for my liking... git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3554 a592a061-630c-0410-9148-cb99ea01b6c8 --- config/lyxinclude.m4 | 2 +- configure.in | 2 +- po/POTFILES.in | 1 + sigc++/Makefile.am | 2 +- src/BufferView2.C | 12 +- src/BufferView_pimpl.C | 18 +-- src/Bullet.C | 8 +- src/ChangeLog | 8 ++ src/DepTable.C | 4 +- src/FontLoader.C | 4 +- src/LaTeXFeatures.C | 16 ++- src/LyXSendto.C | 2 +- src/LyXView.C | 2 +- src/Makefile.am | 10 +- src/Thesaurus.C | 11 +- src/WorkArea.C | 7 +- src/XFormsView.C | 2 +- src/buffer.C | 34 ++--- src/bufferlist.C | 2 +- src/bufferview_funcs.C | 2 +- src/frontends/Alert.C | 142 ++++++++++--------- src/frontends/Alert.h | 40 ++++-- src/frontends/Makefile.am | 15 +- src/frontends/controllers/ControlCharacter.C | 2 +- src/frontends/controllers/Makefile.am | 10 +- src/frontends/controllers/biblio.C | 2 +- src/frontends/controllers/helper_funcs.C | 2 +- src/frontends/support/Makefile.am | 4 +- src/frontends/xforms/Color.C | 12 +- src/frontends/xforms/Color.h | 2 +- src/frontends/xforms/DropDown.C | 14 +- src/frontends/xforms/FormBase.C | 6 +- src/frontends/xforms/FormBibtex.C | 20 ++- src/frontends/xforms/FormCharacter.C | 5 +- src/frontends/xforms/FormCitation.C | 2 +- src/frontends/xforms/FormDocument.C | 34 ++--- src/frontends/xforms/FormDocument.h | 2 +- src/frontends/xforms/FormGraphics.C | 2 +- src/frontends/xforms/FormInset.C | 2 +- src/frontends/xforms/FormMathsSpace.h | 2 +- src/frontends/xforms/FormParagraph.C | 22 ++- src/frontends/xforms/FormPreferences.C | 44 +++--- src/frontends/xforms/FormPreferences.h | 38 ++--- src/frontends/xforms/FormSpellchecker.C | 2 +- src/frontends/xforms/FormTabular.C | 25 +++- src/frontends/xforms/FormTabularCreate.C | 6 +- src/frontends/xforms/FormTexinfo.C | 2 +- src/frontends/xforms/FormThesaurus.C | 46 +++--- src/frontends/xforms/FormToc.C | 4 +- src/frontends/xforms/GUIRunTime.C | 11 +- src/frontends/xforms/Makefile.am | 12 +- src/frontends/xforms/Menubar_pimpl.C | 5 +- src/frontends/xforms/RadioButtonGroup.C | 34 +++-- src/frontends/xforms/RadioButtonGroup.h | 9 +- src/frontends/xforms/Toolbar_pimpl.C | 6 +- src/frontends/xforms/Tooltips.C | 4 +- src/frontends/xforms/combox.C | 11 +- src/frontends/xforms/xforms_helpers.C | 4 +- src/graphics/GraphicsCacheItem.C | 33 +++-- src/graphics/ImageLoaderXPM.C | 17 ++- src/graphics/Makefile.am | 4 +- src/insets/ExternalTemplate.C | 2 +- src/insets/Makefile.am | 4 +- src/insets/figinset.C | 60 ++++---- src/insets/figinset.h | 1 + src/insets/inset.C | 4 +- src/insets/insetbib.C | 2 +- src/insets/insetcite.C | 12 +- src/insets/insetcollapsable.C | 20 +-- src/insets/insetcommand.C | 22 +-- src/insets/insetcommand.h | 12 +- src/insets/inseterror.C | 2 +- src/insets/insetert.C | 26 ++-- src/insets/insetexternal.C | 39 ++--- src/insets/insetfloatlist.C | 9 +- src/insets/insetfoot.C | 5 +- src/insets/insetfootlike.C | 5 +- src/insets/insetgraphics.C | 43 +++--- src/insets/insetgraphicsParams.C | 7 +- src/insets/insetgraphicsParams.h | 4 +- src/insets/insetinclude.C | 2 +- src/insets/insetindex.C | 2 +- src/insets/insetlatexaccent.C | 2 +- src/insets/insetmarginal.C | 5 +- src/insets/insetref.C | 8 +- src/insets/insettabular.C | 10 +- src/insets/insettext.C | 17 +-- src/insets/insettoc.C | 9 +- src/insets/inseturl.C | 4 +- src/iterators.C | 11 +- src/iterators.h | 19 ++- src/kbsequence.C | 11 +- src/lastfiles.C | 16 ++- src/lyx_cb.C | 6 +- src/lyx_gui.C | 4 +- src/lyx_main.C | 4 +- src/lyxfont.h | 2 +- src/lyxfunc.C | 27 ++-- src/lyxlength.C | 2 +- src/lyxlex.C | 2 +- src/lyxlex_pimpl.C | 6 +- src/lyxlookup.C | 2 +- src/lyxrc.C | 2 +- src/lyxserver.C | 6 +- src/lyxtextclass.C | 3 +- src/mathed/Makefile.am | 4 +- src/mathed/formula.C | 2 +- src/mathed/formulabase.C | 4 +- src/mathed/math_arrayinset.C | 3 +- src/mathed/math_atom.C | 6 +- src/mathed/math_binaryopinset.C | 7 +- src/mathed/math_binominset.C | 5 +- src/mathed/math_braceinset.C | 7 +- src/mathed/math_charinset.C | 11 +- src/mathed/math_cursor.C | 20 +-- src/mathed/math_deliminset.C | 11 +- src/mathed/math_extern.C | 19 ++- src/mathed/math_fracinset.C | 5 +- src/mathed/math_gridinset.C | 28 ++-- src/mathed/math_hash.C | 9 +- src/mathed/math_hullinset.C | 12 +- src/mathed/math_inset.C | 10 +- src/mathed/math_macro.C | 13 +- src/mathed/math_macroarg.C | 4 +- src/mathed/math_macrotemplate.C | 5 +- src/mathed/math_mathmlstream.C | 9 +- src/mathed/math_parser.C | 3 +- src/mathed/math_pos.C | 4 +- src/mathed/math_rootinset.C | 13 +- src/mathed/math_scriptinset.C | 17 ++- src/mathed/math_stackrelinset.C | 5 +- src/mathed/math_support.C | 2 +- src/mathed/math_symbolinset.C | 7 +- src/mathed/math_undersetinset.C | 5 +- src/mathed/math_xdata.C | 18 ++- src/mathed/math_xyarrowinset.C | 9 +- src/minibuffer.C | 8 +- src/paragraph.C | 12 +- src/paragraph_pimpl.C | 28 ++-- src/screen.C | 4 +- src/sp_base.h | 9 +- src/support/Makefile.am | 4 +- src/support/copy.C | 19 ++- src/support/lstrings.C | 4 +- src/support/lstrings.h | 13 ++ src/support/lyxfunctional.h | 20 +-- src/support/lyxsum.C | 28 ++-- src/support/os.C | 2 +- src/support/smart_ptr.h | 6 +- src/support/textutils.h | 8 +- src/support/translator.h | 6 +- src/tabular.C | 40 +++--- src/tabular_funcs.C | 6 +- src/tex-accent.C | 2 +- src/texrow.C | 2 +- src/text.C | 34 ++--- src/text2.C | 9 +- src/trans.C | 11 +- src/undo_funcs.C | 13 +- src/vspace.C | 39 +++-- 160 files changed, 1117 insertions(+), 756 deletions(-) diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 8053a27be3..834f7127e0 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -210,7 +210,7 @@ if test x$GXX = xyes; then 2.95.2) CXXFLAGS="$lyx_opt -fno-rtti -fno-exceptions";; 2.95.*) CXXFLAGS="$lyx_opt -fno-exceptions";; 2.96*) CXXFLAGS="$lyx_opt -fno-exceptions";; - 3.0*) CXXFLAGS="$lyx_opt";; + 3.0*) CXXFLAGS="$lyx_opt -fno-rtti -fno-exceptions";; *2.91.*) CXXFLAGS="$lyx_opt -fno-rtti -fno-exceptions";; *) CXXFLAGS="$lyx_opt -fno-rtti -fno-exceptions";; esac diff --git a/configure.in b/configure.in index 1a49588707..2db8f28988 100644 --- a/configure.in +++ b/configure.in @@ -187,7 +187,7 @@ case "$lyx_use_frontend" in xforms) # for now don't set it for xforms as this is always entered FRONTEND="" - FRONTEND_GUILIB="xforms/libxforms.la";; + FRONTEND_GUILIB="xforms/libxforms.o";; gnome) AM_PATH_GTKMM(1.2.1,, AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+)) diff --git a/po/POTFILES.in b/po/POTFILES.in index 3570609547..5585e5ec15 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -9,6 +9,7 @@ src/converter.C src/CutAndPaste.C src/debug.C src/exporter.C +src/ext_l10n.h src/figure_form.C src/figureForm.C src/FontLoader.C diff --git a/sigc++/Makefile.am b/sigc++/Makefile.am index ab0104db7e..898b40ffd3 100644 --- a/sigc++/Makefile.am +++ b/sigc++/Makefile.am @@ -31,7 +31,7 @@ noinst_HEADERS = \ Makefile: $(BUILT_SOURCES) %.h: $(M4_DIR)/%.h.m4 $(M4_DIR)/template.macros.m4 - $(M4) $(M4_INCLUDES) $(DEFINES) $< > $(top_srcdir)/$@ + $(M4) $(M4_INCLUDES) $(DEFINES) $< > $(top_builddir)/$@ all-local: $(noinst_LTLIBRARIES) diff --git a/src/BufferView2.C b/src/BufferView2.C index 892d36e22e..a59f737df8 100644 --- a/src/BufferView2.C +++ b/src/BufferView2.C @@ -118,7 +118,7 @@ bool BufferView::removeAutoInsets() // Iterate until we find a paragraph that won't be immediately deleted. // In reality this should mean we only execute the body of the while // loop once at most. However for safety we iterate rather than just - // make this an if() conditional. + // make this an if () conditional. while ((cur_par_prev || cur_par_next) && text->setCursor(this, cur_par_prev ? cur_par_prev : cur_par_next, @@ -675,12 +675,14 @@ bool BufferView::ChangeRefsIfUnique(string const & from, string const & to) } -bool BufferView::ChangeCitationsIfUnique(string const & from, string const & to) +bool BufferView::ChangeCitationsIfUnique(string const & from, + string const & to) { - - vector > keys = buffer()->getBibkeyList(); + typedef pair StringPair; + + vector keys = buffer()->getBibkeyList(); if (count_if(keys.begin(), keys.end(), - lyx::equal_1st_in_pair(from)) + lyx::equal_1st_in_pair(from)) > 1) return false; diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index 7b0b902e54..9b15c675de 100644 --- a/src/BufferView_pimpl.C +++ b/src/BufferView_pimpl.C @@ -115,7 +115,7 @@ void SetXtermCursor(Window win) { static Cursor cursor; static bool cursor_undefined = true; - if (cursor_undefined){ + if (cursor_undefined) { cursor = XCreateFontCursor(fl_get_display(), XC_xterm); XFlush(fl_get_display()); cursor_undefined = false; @@ -1169,7 +1169,7 @@ void BufferView::Pimpl::cursorPrevious(LyXText * text) text->cursor.y() - text->cursor.row()->baseline() + text->cursor.row()->height() - - workarea_.height() + 1 ); + - workarea_.height() + 1); updateScrollbar(); } @@ -1241,7 +1241,7 @@ void BufferView::Pimpl::restorePosition(unsigned int i) Buffer * b = bufferlist.exists(fname) ? bufferlist.getBuffer(fname) : bufferlist.loadLyXFile(fname); // don't ask, just load it - if (b != 0 ) buffer(b); + if (b != 0) buffer(b); } Paragraph * par = buffer_->getParFromID(saved_positions[i].par_id); @@ -2972,13 +2972,13 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) case LFUN_CITATION_INSERT: { InsetCommandParams p; - p.setFromString( argument ); + p.setFromString(argument); - InsetCitation * inset = new InsetCitation( p ); + InsetCitation * inset = new InsetCitation(p); if (!insertInset(inset)) delete inset; else - updateInset( inset, true ); + updateInset(inset, true); } break; @@ -2990,7 +2990,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) string const db = token(argument, ' ', 0); string const bibstyle = token(argument, ' ', 1); - InsetCommandParams p( "BibTeX", db, bibstyle ); + InsetCommandParams p("BibTeX", db, bibstyle); InsetBibtex * inset = new InsetBibtex(p); if (insertInset(inset)) { @@ -3088,7 +3088,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) case LFUN_PARENTINSERT: { lyxerr << "arg " << argument << endl; - InsetCommandParams p( "lyxparent", argument ); + InsetCommandParams p("lyxparent", argument); Inset * inset = new InsetParent(p, *buffer_); if (!insertInset(inset, "Standard")) delete inset; @@ -3428,7 +3428,7 @@ void BufferView::Pimpl::updateInset(Inset * inset, bool mark_dirty) } else if (bv_->theLockingInset()->updateInsetInInset(bv_, inset)) { if (bv_->text->updateInset(bv_, bv_->theLockingInset())) { update(); - if (mark_dirty){ + if (mark_dirty) { buffer_->markDirty(); } updateScrollbar(); diff --git a/src/Bullet.C b/src/Bullet.C index 8ea4a538ab..b53040a9e3 100644 --- a/src/Bullet.C +++ b/src/Bullet.C @@ -24,10 +24,10 @@ /** The four LaTeX itemize environment default bullets */ extern -Bullet const ITEMIZE_DEFAULTS[4] = { Bullet( 0, 8 ),//"\\(\\bullet\\)" - Bullet( 0, 0 ),//"\\normalfont\\bfseries{--}" - Bullet( 0, 6 ),//"\\(\\ast\\)" - Bullet( 0, 10 ) };//"\\(\\cdot\\)" +Bullet const ITEMIZE_DEFAULTS[4] = { Bullet(0, 8),//"\\(\\bullet\\)" + Bullet(0, 0),//"\\normalfont\\bfseries{--}" + Bullet(0, 6),//"\\(\\ast\\)" + Bullet(0, 10) };//"\\(\\cdot\\)" // will need these later if still using full text as below // \usepackage{latexsym,pifont,amssymb} diff --git a/src/ChangeLog b/src/ChangeLog index 7554898725..2627bb7ba8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2002-02-16 Lars Gullik Bjønnes + + * a lot of small ws changes + * add a lot of using std::XXX + * use std construcs some places where approp. + * use some exisint stuff from lyxfunctional where approp. + * Make file changes to use partial linking (lets test this now...) + 2002-02-16 Angus Leeming * Chktex.C: diff --git a/src/DepTable.C b/src/DepTable.C index 59ddbd77bf..6a358dec46 100644 --- a/src/DepTable.C +++ b/src/DepTable.C @@ -152,11 +152,11 @@ bool DepTable::extchanged(string const & ext) const } -bool DepTable::ext_exist(const string& ext ) const +bool DepTable::ext_exist(const string& ext) const { DepList::const_iterator cit = deplist.begin(); DepList::const_iterator end = deplist.end(); - for (; cit != end; ++cit ) { + for (; cit != end; ++cit) { if (suffixIs(cit->first, ext)) { return true; } diff --git a/src/FontLoader.C b/src/FontLoader.C index 96645375b7..b75d165e91 100644 --- a/src/FontLoader.C +++ b/src/FontLoader.C @@ -279,8 +279,8 @@ XFontStruct * FontLoader::doLoad(LyXFont::FONT_FAMILY family, } getFontinfo(family, series, shape); - int fsize = int( (lyxrc.font_sizes[size] * lyxrc.dpi * - (lyxrc.zoom/100.0) ) / 72.27 + 0.5 ); + int fsize = int((lyxrc.font_sizes[size] * lyxrc.dpi * + (lyxrc.zoom/100.0)) / 72.27 + 0.5); string font = fontinfo[family][series][shape]->getFontname(fsize); diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C index 039beb85fa..91301c5094 100644 --- a/src/LaTeXFeatures.C +++ b/src/LaTeXFeatures.C @@ -33,6 +33,10 @@ using lyx::textclass_type; using std::endl; using std::set; +using std::vector; +using std::find; +using std::ostream; + LaTeXFeatures::LaTeXFeatures(BufferParams const & p, layout_type n) : layout(n, false), params(p) @@ -53,7 +57,7 @@ void LaTeXFeatures::require(string const & name) } -void LaTeXFeatures::useLayout(std::vector::size_type const & idx) +void LaTeXFeatures::useLayout(vector::size_type const & idx) { layout[idx] = true; } @@ -61,9 +65,9 @@ void LaTeXFeatures::useLayout(std::vector::size_type const & idx) bool LaTeXFeatures::isRequired(string const & name) const { - FeaturesList::const_iterator i = std::find(features.begin(), - features.end(), - name); + FeaturesList::const_iterator i = find(features.begin(), + features.end(), + name); return i != features.end(); } @@ -374,7 +378,7 @@ string const LaTeXFeatures::getIncludedFiles(string const & fname) const for (FileMap::const_iterator fi = IncludedFiles.begin(); fi != end; ++fi) sgmlpreamble << "\nfirst - << (IsSGMLFilename(fi->second) ? " SYSTEM \"" : " \"" ) + << (IsSGMLFilename(fi->second) ? " SYSTEM \"" : " \"") << MakeRelPath(fi->second, basename) << "\">"; return sgmlpreamble.str().c_str(); @@ -395,7 +399,7 @@ BufferParams const & LaTeXFeatures::bufferParams() const return params; } -void LaTeXFeatures::getFloatDefinitions(std::ostream & os) const +void LaTeXFeatures::getFloatDefinitions(ostream & os) const { // Here we will output the code to create the needed float styles. // We will try to do this as minimal as possible. diff --git a/src/LyXSendto.C b/src/LyXSendto.C index 99022c6ae1..fba1db3682 100644 --- a/src/LyXSendto.C +++ b/src/LyXSendto.C @@ -81,7 +81,7 @@ void SendtoApplyCB(FL_OBJECT *, long) command += " &"; // execute in background // push directorypath, if necessary string path = buffer->filePath(); - if (lyxrc.use_tempdir || !IsDirWriteable(path)){ + if (lyxrc.use_tempdir || !IsDirWriteable(path)) { path = buffer->tmppath; } Path p(path); diff --git a/src/LyXView.C b/src/LyXView.C index 5b913c99ac..3b049a538c 100644 --- a/src/LyXView.C +++ b/src/LyXView.C @@ -226,7 +226,7 @@ void LyXView::updateWindowTitle() if (view()->available()) { string const cur_title = buffer()->fileName(); - if (!cur_title.empty()){ + if (!cur_title.empty()) { title += ": " + MakeDisplayPath(cur_title, 30); if (!buffer()->isLyxClean()) title += _(" (Changed)"); diff --git a/src/Makefile.am b/src/Makefile.am index 3190ecc449..f1fe39f425 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,13 +4,13 @@ DISTCLEANFILES= *.orig *.rej *~ *.bak core libintl.h config.h MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/config.h.in bin_PROGRAMS = lyx -lyx_DEPENDENCIES = mathed/libmathed.la insets/libinsets.la \ - graphics/libgraphics.la \ - frontends/libfrontends.la \ - support/libsupport.la \ +lyx_DEPENDENCIES = mathed/libmathed.o insets/libinsets.o \ + graphics/libgraphics.o \ + frontends/libfrontends.o \ + support/libsupport.o \ @INCLUDED_SIGC@ lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(SIGC_LIBS) \ - $(PSPELL_LIBS) @AIKSAURUS_LIBS@ + $(PSPELL_LIBS) @AIKSAURUS_LIBS@ @LYX_LIBS@ #lyx_LDFLAGS=-Wl,-O1 EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h version.C.in \ diff --git a/src/Thesaurus.C b/src/Thesaurus.C index e41ecf5fb0..b8e8a74594 100644 --- a/src/Thesaurus.C +++ b/src/Thesaurus.C @@ -10,12 +10,12 @@ #include "Thesaurus.h" +#ifdef HAVE_LIBAIKSAURUS + #include -Thesaurus thesaurus; +using std::sort; -#ifdef HAVE_LIBAIKSAURUS - Thesaurus::Thesaurus() { aik_ = new Aiksaurus; @@ -60,7 +60,7 @@ Thesaurus::Meanings Thesaurus::lookup(string const & text) for (Meanings::iterator it = meanings.begin(); it != meanings.end(); ++it) { - std::sort(it->second.begin(), it->second.end()); + sort(it->second.begin(), it->second.end()); } return meanings; @@ -84,3 +84,6 @@ Thesaurus::Meanings Thesaurus::lookup(string const &) } #endif // HAVE_LIBAIKSAURUS + +// Global instance +Thesaurus thesaurus; diff --git a/src/WorkArea.C b/src/WorkArea.C index ad4751de09..294174cd2d 100644 --- a/src/WorkArea.C +++ b/src/WorkArea.C @@ -37,6 +37,7 @@ FL_APPEVENT_CB fl_set_preemptive_callback(Window, FL_APPEVENT_CB, void *); using std::endl; using std::abs; +using std::hex; FL_OBJECT * figinset_canvas; @@ -354,7 +355,7 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event, if (!area) return 1; - switch (event){ + switch (event) { case FL_DRAW: if (!area->work_area || !area->work_area->form->visible) @@ -614,8 +615,8 @@ string const WorkArea::getClipboard() const if (fl_check_forms() == FL_EVENT) { fl_XNextEvent(&ev); lyxerr << "Received unhandled X11 event" << endl; - lyxerr << "Type: 0x" << std::hex << ev.xany.type << - "Target: 0x" << std::hex << ev.xany.window << endl; + lyxerr << "Type: 0x" << hex << ev.xany.type << + "Target: 0x" << hex << ev.xany.window << endl; } } return clipboard_selection; diff --git a/src/XFormsView.C b/src/XFormsView.C index ee8c67f1ec..9dac079897 100644 --- a/src/XFormsView.C +++ b/src/XFormsView.C @@ -233,7 +233,7 @@ void XFormsView::prohibitInput() const static Cursor cursor; static bool cursor_undefined = true; - if (cursor_undefined){ + if (cursor_undefined) { cursor = XCreateFontCursor(fl_get_display(), XC_watch); XFlush(fl_get_display()); cursor_undefined = false; diff --git a/src/buffer.C b/src/buffer.C index e888e3588e..c42098707b 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -1530,7 +1530,7 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par, } else if (tmptok == "Note") { inset = new InsetNote; } else if (tmptok == "Include") { - InsetCommandParams p( "Include" ); + InsetCommandParams p("Include"); inset = new InsetInclude(p, *this); } else if (tmptok == "ERT") { inset = new InsetERT; @@ -2086,7 +2086,7 @@ void Buffer::makeLaTeXFile(string const & fname, // original_path is set. This is done for usual tex-file, but not // for nice-latex-file. (Matthias 250696) if (!only_body) { - if (!nice){ + if (!nice) { // code for usual, NOT nice-latex-file ofs << "\\batchmode\n"; // changed // from \nonstopmode @@ -2185,7 +2185,7 @@ void Buffer::makeLaTeXFile(string const & fname, } string strOptions(options.str().c_str()); - if (!strOptions.empty()){ + if (!strOptions.empty()) { strOptions = strip(strOptions, ','); ofs << '[' << strOptions << ']'; } @@ -2692,7 +2692,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) if (par->isInset(0)) { Inset * inset = par->getInset(0); Inset::Code lyx_code = inset->lyxCode(); - if (lyx_code == Inset::TOC_CODE){ + if (lyx_code == Inset::TOC_CODE) { string const temp = "toc"; sgmlOpenTag(ofs, depth, temp); @@ -2728,7 +2728,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) _("Error : Wrong depth for" " LatexType Command.\n")); - if (!environment_stack[depth].empty()){ + if (!environment_stack[depth].empty()) { sgmlCloseTag(ofs, depth, environment_stack[depth]); ofs << "

"; @@ -2861,7 +2861,7 @@ void operator|=(PAR_TAG & p1, PAR_TAG const & p2) inline void reset(PAR_TAG & p1, PAR_TAG const & p2) { - p1 = static_cast( p1 & ~p2); + p1 = static_cast(p1 & ~p2); } } // namespace anon @@ -2986,7 +2986,7 @@ void Buffer::simpleLinuxDocOnePar(ostream & os, } list < PAR_TAG > temp; - while (!tag_state.empty() && tag_close ) { + while (!tag_state.empty() && tag_close) { PAR_TAG k = tag_state.top(); tag_state.pop(); os << ""; @@ -3227,7 +3227,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) if (par->isInset(0)) { Inset * inset = par->getInset(0); Inset::Code lyx_code = inset->lyxCode(); - if (lyx_code == Inset::LABEL_CODE){ + if (lyx_code == Inset::LABEL_CODE) { command_name += " id=\""; command_name += (static_cast(inset))->getContents(); command_name += "\""; @@ -3251,7 +3251,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) } if (environment_stack[depth] != style.latexname()) { - if(environment_stack.size() == depth + 1) { + if (environment_stack.size() == depth + 1) { environment_stack.push_back("!-- --"); environment_inner.push_back("!-- --"); } @@ -3274,7 +3274,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) if (style.latextype == LATEX_ENVIRONMENT) { if (!style.latexparam().empty()) { - if(style.latexparam() == "CDATA") + if (style.latexparam() == "CDATA") ofs << ""; else sgmlCloseTag(ofs, depth + command_depth, @@ -3398,17 +3398,17 @@ void Buffer::simpleDocBookOnePar(ostream & os, if (font.emph() == LyXFont::ON) { os << ""; emph_flag = true; - }else if(i) { + } else if (i) { os << ""; emph_flag = false; } } - if ( par->isInset(i) ) { + if (par->isInset(i)) { Inset * inset = par->getInset(i); // don't print the inset in position 0 if desc_on == 3 (label) - if ( i || desc_on != 3) + if (i || desc_on != 3) inset->docbook(this, os); } else { char c = par->getChar(i); @@ -3417,7 +3417,7 @@ void Buffer::simpleDocBookOnePar(ostream & os, if (style.pass_thru) { os << c; - } else if(style.free_spacing || par->isFreeSpacing() || c != ' ') { + } else if (style.free_spacing || par->isFreeSpacing() || c != ' ') { os << sgml_string; } else if (desc_on ==1) { ++char_line_count; @@ -3439,7 +3439,7 @@ void Buffer::simpleDocBookOnePar(ostream & os, // not closed... os << ""; } - if(style.free_spacing) os << '\n'; + if (style.free_spacing) os << '\n'; } @@ -3484,7 +3484,7 @@ int Buffer::runChktex() // if we removed error insets before we ran chktex or if we inserted // error insets after we ran chktex, this must be run: - if (removedErrorInsets || res){ + if (removedErrorInsets || res) { users->redraw(); users->fitCursor(); } diff --git a/src/bufferlist.C b/src/bufferlist.C index 8fd835dd35..060e6269fc 100644 --- a/src/bufferlist.C +++ b/src/bufferlist.C @@ -198,7 +198,7 @@ bool BufferList::close(Buffer * buf) while (reask) { switch (Alert::askConfirmation(_("Changes in document:"), fname, - _("Save document?"))){ + _("Save document?"))) { case 1: // Yes if (buf->isUnnamed()) reask = !WriteAs(current_view, buf); diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C index 7ab2815f37..1331407e33 100644 --- a/src/bufferview_funcs.C +++ b/src/bufferview_funcs.C @@ -233,7 +233,7 @@ void toggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall) text->computeBidiTables(bv->buffer(), cursor.row()); if (cursor.boundary() != text->isBoundary(bv->buffer(), cursor.par(), cursor.pos(), - text->real_current_font) ) + text->real_current_font)) text->setCursor(bv, cursor.par(), cursor.pos(), false, !cursor.boundary()); } diff --git a/src/frontends/Alert.C b/src/frontends/Alert.C index 474d536759..4463d63d75 100644 --- a/src/frontends/Alert.C +++ b/src/frontends/Alert.C @@ -7,82 +7,96 @@ */ #include - -#include - + +#include "Alert.h" + #include "debug.h" #include "lyxrc.h" #include "Alert_pimpl.h" +#include + using std::endl; +using std::pair; +using std::make_pair; -namespace Alert { - - void alert(string const & s1, string const & s2, string const & s3) { - if (!lyxrc.use_gui) { - lyxerr << "----------------------------------------" << endl - << s1 << endl << s2 << endl << s3 << endl - << "----------------------------------------" << endl; - } else { - alert_pimpl(s1, s2, s3); - } - } - void err_alert(string const & s1, string const & s2) { - alert(s1, s2, strerror(errno)); +void Alert::alert(string const & s1, string const & s2, string const & s3) +{ + if (!lyxrc.use_gui) { + lyxerr << "------------------------------" << endl + << s1 << endl << s2 << endl << s3 << endl + << "------------------------------" << endl; + } else { + alert_pimpl(s1, s2, s3); } +} - bool askQuestion(string const & s1, string const & s2, string const & s3, bool default_value) { - if (!lyxrc.use_gui) { - lyxerr << "----------------------------------------" << endl - << s1 << endl; - if (!s2.empty()) - lyxerr << s2 << endl; - if (!s3.empty()) - lyxerr << s3 << endl; - lyxerr << "Assuming answer is " - << (default_value ? "yes" : "no") - << endl - << "----------------------------------------" << endl; - return default_value; - } else { - return askQuestion_pimpl(s1, s2, s3); - } + +void Alert::err_alert(string const & s1, string const & s2) +{ + alert(s1, s2, strerror(errno)); +} + + +bool Alert::askQuestion(string const & s1, string const & s2, + string const & s3, bool default_value) +{ + if (!lyxrc.use_gui) { + lyxerr << "----------------------------------------" << endl + << s1 << endl; + if (!s2.empty()) + lyxerr << s2 << endl; + if (!s3.empty()) + lyxerr << s3 << endl; + lyxerr << "Assuming answer is " + << (default_value ? "yes" : "no") + << endl + << "----------------------------------------" << endl; + return default_value; + } else { + return askQuestion_pimpl(s1, s2, s3); } +} - int askConfirmation(string const & s1, string const & s2, string const & s3, int default_value) { - if (!lyxrc.use_gui) { - lyxerr << "----------------------------------------" << endl - << s1 << endl; - if (!s2.empty()) - lyxerr << s2 << endl; - if (!s3.empty()) - lyxerr << s3 << endl; - lyxerr << "Assuming answer is "; - if (default_value == 1) - lyxerr << "yes"; - else if (default_value == 2) - lyxerr << "no"; - else - lyxerr << "cancel"; - lyxerr << endl - << "----------------------------------------" << endl; - return default_value; - } else { - return askConfirmation_pimpl(s1, s2, s3); - } + +int Alert::askConfirmation(string const & s1, string const & s2, + string const & s3, int default_value) +{ + if (!lyxrc.use_gui) { + lyxerr << "----------------------------------------" << endl + << s1 << endl; + if (!s2.empty()) + lyxerr << s2 << endl; + if (!s3.empty()) + lyxerr << s3 << endl; + lyxerr << "Assuming answer is "; + if (default_value == 1) + lyxerr << "yes"; + else if (default_value == 2) + lyxerr << "no"; + else + lyxerr << "cancel"; + lyxerr << endl + << "----------------------------------------" << endl; + return default_value; + } else { + return askConfirmation_pimpl(s1, s2, s3); } - - std::pair const askForText(string const & msg, string const & dflt) { - if (!lyxrc.use_gui) { - lyxerr << "----------------------------------------" << endl - << msg << endl - << "Assuming answer is " << dflt - << "----------------------------------------" << endl; - return std::make_pair(true, dflt); - } else { - return askForText_pimpl(msg, dflt); - } +} + + +pair const Alert::askForText(string const & msg, + string const & dflt) +{ + if (!lyxrc.use_gui) { + lyxerr << "----------------------------------------" << endl + << msg << endl + << "Assuming answer is " << dflt + << "----------------------------------------" << endl; + return make_pair(true, dflt); + } else { + return askForText_pimpl(msg, dflt); } } diff --git a/src/frontends/Alert.h b/src/frontends/Alert.h index 0fe2a71417..6f8efd0e07 100644 --- a/src/frontends/Alert.h +++ b/src/frontends/Alert.h @@ -1,3 +1,4 @@ +// -*- C++ -*- /** * \file Alert.h * Copyright 2001 the LyX Team @@ -6,26 +7,35 @@ * \author John Levon */ +#ifndef LYX_ALERT_H +#define LYX_ALERT_H + #include "support/lstrings.h" + #include - + namespace Alert { - /// show an alert message - void alert(string const & s1, string const & s2 = string(), - string const & s3 = string()); - /// show an alert message and strerror(errno) - void err_alert(string const & s1, string const & s2 = string()); +/// show an alert message +void alert(string const & s1, string const & s2 = string(), + string const & s3 = string()); + +/// show an alert message and strerror(errno) +void err_alert(string const & s1, string const & s2 = string()); - /// ask a question - bool askQuestion(string const & s1, string const & s2 = string(), +/// ask a question +bool askQuestion(string const & s1, string const & s2 = string(), string const & s3 = string(), bool default_value = true); - /// Returns 1 for yes, 2 for no, 3 for cancel. - int askConfirmation(string const & s1, string const & s2 = string(), - string const & s3 = string(), int default_value = 1); - - /// Asks for a text - std::pair const askForText(string const & msg, - string const & dflt = string()); +/// Returns 1 for yes, 2 for no, 3 for cancel. +int askConfirmation(string const & s1, string const & s2 = string(), + string const & s3 = string(), int default_value = 1); + +/// Asks for a text +std::pair const +askForText(string const & msg, + string const & dflt = string()); + } + +#endif diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am index 5072965fba..3cb18f2157 100644 --- a/src/frontends/Makefile.am +++ b/src/frontends/Makefile.am @@ -9,17 +9,16 @@ ETAGS_ARGS = --lang=c++ BOOST_INCLUDES = -I$(top_srcdir)/boost INCLUDES = ${FRONTEND_INCLUDES} -I${srcdir}/.. -I${srcdir}/xforms ${SIGC_CFLAGS} $(BOOST_INCLUDES) LIBS = -noinst_LTLIBRARIES = libfrontends.la +noinst_LTLIBRARIES = libfrontends.o -libfrontends_la_LIBADD= @FRONTEND_GUILIB@ \ - support/libfrontendsupport.la \ - controllers/libcontrollers.la +libfrontends_o_LIBADD= `cat libxforms.objects` \ + `cat libcontrollers.objects` \ + support/libfrontendsupport.o -libfrontends_la_DEPENDENCIES = @FRONTEND_GUILIB@ \ - support/libfrontendsupport.la \ - controllers/libcontrollers.la +libfrontends_o_DEPENDENCIES = \ + support/libfrontendsupport.o -libfrontends_la_SOURCES=\ +libfrontends_o_SOURCES=\ Alert.C \ Alert.h \ Alert_pimpl.h \ diff --git a/src/frontends/controllers/ControlCharacter.C b/src/frontends/controllers/ControlCharacter.C index a8c7f18397..2d108af96e 100644 --- a/src/frontends/controllers/ControlCharacter.C +++ b/src/frontends/controllers/ControlCharacter.C @@ -229,7 +229,7 @@ void ControlCharacter::setLanguage(string const & val) if (val == _("No change")) font_->setLanguage(ignore_language); - else if ( val == _("Reset")) + else if (val == _("Reset")) font_->setLanguage(lv_.buffer()->params.language); else diff --git a/src/frontends/controllers/Makefile.am b/src/frontends/controllers/Makefile.am index 0942eb4607..c596a846d3 100644 --- a/src/frontends/controllers/Makefile.am +++ b/src/frontends/controllers/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 DISTCLEANFILES= *.orig *.rej *~ *.bak core MAINTAINERCLEANFILES = $(srcdir)/Makefile.in -noinst_LTLIBRARIES = libcontrollers.la +noinst_LTLIBRARIES = libcontrollers.o BOOST_INCLUDES = -I$(top_srcdir)/boost INCLUDES = -I${top_srcdir}/src/ \ -I${top_srcdir}/src/frontends/ \ @@ -11,7 +11,7 @@ ETAGS_ARGS = --lang=c++ EXTRA_DIST = ButtonController.tmpl ControlDialog.tmpl ControlInset.tmpl -libcontrollers_la_SOURCES=\ +libcontrollers_o_SOURCES=\ biblio.C \ biblio.h \ character.C \ @@ -87,3 +87,9 @@ libcontrollers_la_SOURCES=\ ViewBase.h \ helper_funcs.C \ helper_funcs.h + +libcontrollers.o: $(libcontrollers_o_OBJECTS) $(libcontrollers_o_DEPENDENCIES) + rm -f ../libcontrollers.objects + for fil in $(libcontrollers_o_OBJECTS) ; do \ + echo controllers/$$fil >> ../libcontrollers.objects ; \ + done diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C index a973c6e843..658160f581 100644 --- a/src/frontends/controllers/biblio.C +++ b/src/frontends/controllers/biblio.C @@ -302,7 +302,7 @@ searchKeys(InfoMap const & theMap, bool caseSensitive) { // Preliminary checks - if(start < keys.begin() || start >= keys.end()) + if (start < keys.begin() || start >= keys.end()) return keys.end(); string search_expr = frontStrip(strip(expr)); diff --git a/src/frontends/controllers/helper_funcs.C b/src/frontends/controllers/helper_funcs.C index 0e5c135afe..3648282def 100644 --- a/src/frontends/controllers/helper_funcs.C +++ b/src/frontends/controllers/helper_funcs.C @@ -121,7 +121,7 @@ string const browseRelFile(LyXView * lv, string const & filename, string const outname = browseFile(lv, fname, title, pattern, dir1, dir2); string const reloutname = MakeRelPath(outname, refpath); - if(prefixIs(reloutname, "../")) + if (prefixIs(reloutname, "../")) return outname; else return reloutname; diff --git a/src/frontends/support/Makefile.am b/src/frontends/support/Makefile.am index 661c59a826..e227dc1390 100644 --- a/src/frontends/support/Makefile.am +++ b/src/frontends/support/Makefile.am @@ -1,12 +1,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 DISTCLEANFILES= *.orig *.rej *~ *.bak core MAINTAINERCLEANFILES = $(srcdir)/Makefile.in -noinst_LTLIBRARIES = libfrontendsupport.la +noinst_LTLIBRARIES = libfrontendsupport.o LIBS = ETAGS_ARGS = --lang=c++ INCLUDES = -I${srcdir}/../../ $(SIGC_CFLAGS) -libfrontendsupport_la_SOURCES = \ +libfrontendsupport_o_SOURCES = \ LyXImage.h \ LyXImage.C diff --git a/src/frontends/xforms/Color.C b/src/frontends/xforms/Color.C index 262a299712..82706e055e 100644 --- a/src/frontends/xforms/Color.C +++ b/src/frontends/xforms/Color.C @@ -45,7 +45,7 @@ RGBColor::RGBColor(HSVColor const & hsv) h /= 60.0; int const j = max(0, static_cast(::floor(h))); - //if( j < 0 ) j = 0; + //if (j < 0) j = 0; double const f = h - j; double const p = v * (1.0 - s); @@ -91,9 +91,9 @@ RGBColor::RGBColor(HSVColor const & hsv) } } - r = static_cast( ::floor((rd * 255.0) + 0.5) ); - g = static_cast( ::floor((gd * 255.0) + 0.5) ); - b = static_cast( ::floor((bd * 255.0) + 0.5) ); + r = static_cast(::floor((rd * 255.0) + 0.5)); + g = static_cast(::floor((gd * 255.0) + 0.5)); + b = static_cast(::floor((bd * 255.0) + 0.5)); } @@ -103,8 +103,8 @@ HSVColor::HSVColor(RGBColor const & rgb) double const g = rgb.g / 255.0; double const b = rgb.b / 255.0; - double const maxval = max( max( r, g ), b ); - double const minval = min( min( r, g ), b ); + double const maxval = max( max( r, g), b); + double const minval = min( min( r, g), b); v = maxval; diff --git a/src/frontends/xforms/Color.h b/src/frontends/xforms/Color.h index 48b1d88599..a257867afd 100644 --- a/src/frontends/xforms/Color.h +++ b/src/frontends/xforms/Color.h @@ -43,7 +43,7 @@ struct RGBColor { struct NamedColor : public RGBColor { string name; NamedColor() : RGBColor() {} - NamedColor(string const & n, RGBColor const & c ) + NamedColor(string const & n, RGBColor const & c) : RGBColor(c), name(n) {} RGBColor const & color() const { return *this; } string const & getname() const { return name; } diff --git a/src/frontends/xforms/DropDown.C b/src/frontends/xforms/DropDown.C index 6d8791e12a..17cce0981f 100644 --- a/src/frontends/xforms/DropDown.C +++ b/src/frontends/xforms/DropDown.C @@ -13,7 +13,11 @@ #include #include - + + +using std::vector; + + namespace { extern "C" void C_CompletedCB(FL_OBJECT * ob, long) @@ -54,15 +58,17 @@ DropDown::~DropDown() } -void DropDown::select(std::vector const & choices, int x, int y, int w) +void DropDown::select(vector const & choices, int x, int y, int w) { if (choices.empty()) return; fl_set_form_geometry(form_, x, y-100, w, 100); fl_clear_browser(browser_); - for (std::vector::const_iterator cit = choices.begin(); - cit != choices.end(); ++cit) { + + vector::const_iterator cit = choices.begin(); + vector::const_iterator end = choices.end(); + for (; cit != end; ++cit) { fl_add_browser_line(browser_, cit->c_str()); } fl_select_browser_line(browser_, 1); diff --git a/src/frontends/xforms/FormBase.C b/src/frontends/xforms/FormBase.C index a2e65732de..bb16b6fa75 100644 --- a/src/frontends/xforms/FormBase.C +++ b/src/frontends/xforms/FormBase.C @@ -192,7 +192,7 @@ void FormBase::fillTooltipChoice(FL_OBJECT * ob) fl_clear_choice(ob); fl_addto_choice(ob, _(" None | Normal | Verbose ")); - switch(tooltip_level_){ + switch (tooltip_level_) { case NO_TOOLTIP: fl_set_choice(ob, 1); break; @@ -211,7 +211,7 @@ void FormBase::setTooltipLevel(FL_OBJECT * ob) lyx::Assert(ob && ob->objclass == FL_CHOICE && fl_get_choice_maxitems(ob) == 3); - switch(fl_get_choice(ob)){ + switch (fl_get_choice(ob)) { case 1: tooltip_level_ = NO_TOOLTIP; break; @@ -313,7 +313,7 @@ static int C_FormBasePrehandler(FL_OBJECT * ob, int event, // using the middle mouse button. pre->InputCB(ob, 0); - } else if (event == FL_ENTER || event == FL_LEAVE){ + } else if (event == FL_ENTER || event == FL_LEAVE) { // Post feedback as the mouse enters the object, // remove it as the mouse leaves. pre->FeedbackCB(ob, event); diff --git a/src/frontends/xforms/FormBibtex.C b/src/frontends/xforms/FormBibtex.C index 27a2f1217f..6dce7788cf 100644 --- a/src/frontends/xforms/FormBibtex.C +++ b/src/frontends/xforms/FormBibtex.C @@ -26,6 +26,10 @@ #include "support/filetools.h" +using std::vector; +using std::sort; + + typedef FormCB > base_class; FormBibtex::FormBibtex(ControlBibtex & c) @@ -133,17 +137,19 @@ namespace { // Remove all duplicate entries in c. // Taken stright out of Stroustrup -template void eliminate_duplicates(C & c) +template +void eliminate_duplicates(C & c) { - std::sort(c.begin(), c.end()); // sort - typename C::iterator p = std::unique(c.begin(), c.end()); // compact - c.erase(p, c.end()); // shrink + sort(c.begin(), c.end()); + typename C::iterator p = std::unique(c.begin(), c.end()); + c.erase(p, c.end()); } + string const unique_and_no_extensions(string const & str_in) { - std::vector dbase = getVectorFromString(str_in); - for (std::vector::iterator it = dbase.begin(); + vector dbase = getVectorFromString(str_in); + for (vector::iterator it = dbase.begin(); it != dbase.end(); ++it) { *it = ChangeExtension(*it, ""); } @@ -183,7 +189,7 @@ void FormBibtex::apply() // bibtotoc and no style controller().params().setOptions("bibtotoc"); - } else if (!bibstyle.empty()){ + } else if (!bibstyle.empty()) { // only style controller().params().setOptions(bibstyle); } diff --git a/src/frontends/xforms/FormCharacter.C b/src/frontends/xforms/FormCharacter.C index f9357d35d2..25e135c3e8 100644 --- a/src/frontends/xforms/FormCharacter.C +++ b/src/frontends/xforms/FormCharacter.C @@ -24,6 +24,8 @@ #include "helper_funcs.h" using std::vector; +using std::find; + using namespace character; typedef FormCB > base_class; @@ -140,8 +142,7 @@ namespace { template typename vector::size_type findPos(vector const & vec, A const & val) { - vector::const_iterator it = - std::find(vec.begin(), vec.end(), val); + vector::const_iterator it = find(vec.begin(), vec.end(), val); if (it == vec.end()) return 0; return it - vec.begin(); diff --git a/src/frontends/xforms/FormCitation.C b/src/frontends/xforms/FormCitation.C index 98ca7a4b6b..82b850c37d 100644 --- a/src/frontends/xforms/FormCitation.C +++ b/src/frontends/xforms/FormCitation.C @@ -251,7 +251,7 @@ ButtonPolicy::SMInput FormCitation::input(FL_OBJECT * ob, long) string const tmp = formatted(biblio::getInfo(theMap, bibkeys[sel-1]), - dialog_->browser_info->w-10 ); + dialog_->browser_info->w-10); fl_add_browser_line(dialog_->browser_info, tmp.c_str()); // Highlight the selected browser_bib key in browser_cite if diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C index c18b7d201c..7e91036be9 100644 --- a/src/frontends/xforms/FormDocument.C +++ b/src/frontends/xforms/FormDocument.C @@ -65,14 +65,14 @@ FormDocument::FormDocument(LyXView * lv, Dialogs * d) void FormDocument::redraw() { - if( form() && form()->visible ) - fl_redraw_form( form() ); + if (form() && form()->visible) + fl_redraw_form(form()); else return; FL_FORM * outer_form = fl_get_active_folder(dialog_->tabbed_folder); if (outer_form && outer_form->visible) - fl_redraw_form( outer_form ); + fl_redraw_form(outer_form); } @@ -376,9 +376,9 @@ bool saveParamsAsDefault(BufferParams const ¶ms) } //namespace -bool FormDocument::input( FL_OBJECT * ob, long data ) +bool FormDocument::input(FL_OBJECT * ob, long data) { - State cb = static_cast( data ); + State cb = static_cast(data); switch (cb) { case CHECKCHOICECLASS: @@ -1272,7 +1272,7 @@ bool FormDocument::CheckDocumentInput(FL_OBJECT * ob, long) } -void FormDocument::ChoiceBulletSize(FL_OBJECT * ob, long /*data*/ ) +void FormDocument::ChoiceBulletSize(FL_OBJECT * ob, long /*data*/) { BufferParams & param = lv_->buffer()->params; @@ -1305,13 +1305,13 @@ void FormDocument::BulletDepth(FL_OBJECT * ob, State cb) BufferParams & param = lv_->buffer()->params; int data = 0; - if (cb == BULLETDEPTH1 ) + if (cb == BULLETDEPTH1) data = 0; - else if (cb == BULLETDEPTH2 ) + else if (cb == BULLETDEPTH2) data = 1; - else if (cb == BULLETDEPTH3 ) + else if (cb == BULLETDEPTH3) data = 2; - else if (cb == BULLETDEPTH4 ) + else if (cb == BULLETDEPTH4) data = 3; switch (fl_get_button_numb(ob)) { @@ -1334,17 +1334,17 @@ void FormDocument::BulletPanel(FL_OBJECT * /*ob*/, State cb) /* by the user. (eg. standard.xpm, psnfss1.xpm etc...) */ int data = 0; - if (cb == BULLETPANEL1 ) + if (cb == BULLETPANEL1) data = 0; - else if (cb == BULLETPANEL2 ) + else if (cb == BULLETPANEL2) data = 1; - else if (cb == BULLETPANEL3 ) + else if (cb == BULLETPANEL3) data = 2; - else if (cb == BULLETPANEL4 ) + else if (cb == BULLETPANEL4) data = 3; - else if (cb == BULLETPANEL5 ) + else if (cb == BULLETPANEL5) data = 4; - else if (cb == BULLETPANEL6 ) + else if (cb == BULLETPANEL6) data = 5; if (data != current_bullet_panel) { @@ -1390,7 +1390,7 @@ void FormDocument::BulletPanel(FL_OBJECT * /*ob*/, State cb) } -void FormDocument::BulletBMTable(FL_OBJECT * ob, long /*data*/ ) +void FormDocument::BulletBMTable(FL_OBJECT * ob, long /*data*/) { /* handle the user input by setting the current bullet depth's pixmap */ /* to that extracted from the current chosen position of the BMTable */ diff --git a/src/frontends/xforms/FormDocument.h b/src/frontends/xforms/FormDocument.h index a27d9f659c..f87f169c3c 100644 --- a/src/frontends/xforms/FormDocument.h +++ b/src/frontends/xforms/FormDocument.h @@ -83,7 +83,7 @@ private: /// Build the dialog virtual void build(); /// Filter the inputs - virtual bool input( FL_OBJECT *, long ); + virtual bool input( FL_OBJECT *, long); /// Update the dialog. virtual void update(); /// Apply from dialog diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C index bd961ae2a5..4222641bc6 100644 --- a/src/frontends/xforms/FormGraphics.C +++ b/src/frontends/xforms/FormGraphics.C @@ -56,7 +56,7 @@ FormGraphics::FormGraphics(ControlGraphics & c) void FormGraphics::redraw() { - if(form() && form()->visible) + if (form() && form()->visible) fl_redraw_form(form()); else return; diff --git a/src/frontends/xforms/FormInset.C b/src/frontends/xforms/FormInset.C index 3f0c6676f5..5597c7f81a 100644 --- a/src/frontends/xforms/FormInset.C +++ b/src/frontends/xforms/FormInset.C @@ -91,7 +91,7 @@ void FormCommand::createInset(string const & arg) } params.setFromString(arg); - if ( !arg.empty() ) + if ( !arg.empty()) bc().valid(); // so that the user can press Ok show(); } diff --git a/src/frontends/xforms/FormMathsSpace.h b/src/frontends/xforms/FormMathsSpace.h index c7a1fafd4a..f9e4f534be 100644 --- a/src/frontends/xforms/FormMathsSpace.h +++ b/src/frontends/xforms/FormMathsSpace.h @@ -28,7 +28,7 @@ struct FD_form_maths_space; class FormMathsSpace : public FormMathsSub { public: /// - FormMathsSpace(LyXView *, Dialogs * , FormMathsPanel const & ); + FormMathsSpace(LyXView *, Dialogs * , FormMathsPanel const &); private: /// Build the dialog diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C index c4fa2e4489..bfe459e07b 100644 --- a/src/frontends/xforms/FormParagraph.C +++ b/src/frontends/xforms/FormParagraph.C @@ -35,8 +35,12 @@ #include "support/lstrings.h" +#include + using Liason::setMinibuffer; using SigC::slot; +using std::vector; +using std::bind2nd; FormParagraph::FormParagraph(LyXView * lv, Dialogs * d) @@ -91,8 +95,8 @@ void FormParagraph::changedParagraph() void FormParagraph::redraw() { - if( form() && form()->visible ) - fl_redraw_form( form() ); + if (form() && form()->visible) + fl_redraw_form(form()); } @@ -126,12 +130,22 @@ void FormParagraph::build() // Create the contents of the unit choices // Don't include the "%" terms... - std::vector units_vec = getLatexUnits(); - for (std::vector::iterator it = units_vec.begin(); +#warning A bit dangerous... (Lgb) + vector units_vec = getLatexUnits(); +#if 0 + for (vector::iterator it = units_vec.begin(); it != units_vec.end(); ++it) { if (contains(*it, "%")) it = units_vec.erase(it, it+1) - 1; } +#else + // Something similar to this is a better way to erase + vector::iterator del = + remove_if(units_vec.begin(), units_vec.end(), + bind2nd(contains_functor(), "%")); + units_vec.erase(del, units_vec.end()); +#endif + string units = getStringFromVector(units_vec, "|"); fl_addto_choice(dialog_->choice_value_space_above, units.c_str()); diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C index a63609fc4d..aba6c9ee75 100644 --- a/src/frontends/xforms/FormPreferences.C +++ b/src/frontends/xforms/FormPreferences.C @@ -37,15 +37,16 @@ #include "lyxrc.h" #include "combox.h" #include "debug.h" -#include "support/filetools.h" -#include "support/LAssert.h" #include "lyxlex.h" #include "input_validators.h" #include "xforms_helpers.h" #include "helper_funcs.h" #include "converter.h" + #include "support/lyxfunctional.h" #include "support/lyxmanip.h" +#include "support/filetools.h" +#include "support/LAssert.h" using std::endl; using std::pair; @@ -53,6 +54,9 @@ using std::make_pair; using std::max; using std::min; using std::vector; +using std::setw; +using std::setfill; + using SigC::slot; extern string system_lyxdir; @@ -564,7 +568,7 @@ void FormPreferences::Colors::AdjustVal(int colAdjust, int colParent, HSVColor hsv(rgb); hsv.v += addVal; - hsv.v = min( 1.0, max(0.0, hsv.v) ); + hsv.v = min(1.0, max(0.0, hsv.v)); rgb = RGBColor(hsv); fl_mapcolor(colAdjust, rgb.r, rgb.g, rgb.b); @@ -580,7 +584,7 @@ void FormPreferences::Colors::InputBrowserLyX() const // Is the choice an Xforms color... RGBColor col; - if( selLyX-1 < xformsColorDB.size() ) { + if (selLyX - 1 < xformsColorDB.size()) { vector::size_type const i = selLyX - 1; col = xformsColorDB[i].color(); } @@ -643,7 +647,7 @@ void FormPreferences::Colors::InputHSV() bool modify = false; // Is the choice an Xforms color... - if( selLyX-1 < xformsColorDB.size() ) { + if (selLyX - 1 < xformsColorDB.size()) { vector::size_type const i = selLyX - 1; modify = (xformsColorDB[i].color() != col); } @@ -684,7 +688,7 @@ void FormPreferences::Colors::InputRGB() bool modify = false; // Is the choice an Xforms color... - if( selLyX-1 < xformsColorDB.size() ) { + if (selLyX - 1 < xformsColorDB.size()) { vector::size_type const i = selLyX - 1; modify = (xformsColorDB[i].color() != col); } @@ -827,7 +831,7 @@ void FormPreferences::Colors::Modify() fl_getmcolor(GUI_COLOR_CHOICE, &col.r, &col.g, &col.b); // Is the choice an Xforms color... - if( selLyX-1 < xformsColorDB.size() ) { + if (selLyX - 1 < xformsColorDB.size()) { vector::size_type const i = selLyX - 1; xformsColorDB[i].r = col.r; xformsColorDB[i].g = col.g; @@ -915,10 +919,10 @@ string const FormPreferences::Colors::X11hexname(RGBColor const & col) const { ostringstream ostr; - ostr << "#" << std::setbase(16) << std::setfill('0') - << std::setw(2) << col.r - << std::setw(2) << col.g - << std::setw(2) << col.b; + ostr << "#" << std::setbase(16) << setfill('0') + << setw(2) << col.r + << setw(2) << col.g + << setw(2) << col.b; return ostr.str().c_str(); } @@ -1183,7 +1187,7 @@ void FormPreferences::Converters::UpdateChoices() const } -FormPreferences::Formats::Formats( FormPreferences & p ) +FormPreferences::Formats::Formats(FormPreferences & p) : parent_(p) {} @@ -1408,7 +1412,7 @@ bool FormPreferences::Formats::Input() } -FormPreferences::InputsMisc::InputsMisc( FormPreferences & p ) +FormPreferences::InputsMisc::InputsMisc(FormPreferences & p) : parent_(p) {} @@ -1456,7 +1460,7 @@ void FormPreferences::InputsMisc::update() } -FormPreferences::Interface::Interface( FormPreferences & p ) +FormPreferences::Interface::Interface(FormPreferences & p) : parent_(p) {} @@ -1573,7 +1577,7 @@ void FormPreferences::Interface::update() } -FormPreferences::Language::Language( FormPreferences & p ) +FormPreferences::Language::Language(FormPreferences & p) : parent_(p) {} @@ -1803,7 +1807,7 @@ void FormPreferences::Language::ComboCB(int, void * v, Combox * combox) } -FormPreferences::LnFmisc::LnFmisc( FormPreferences & p ) +FormPreferences::LnFmisc::LnFmisc(FormPreferences & p) : parent_(p) {} @@ -1931,7 +1935,7 @@ void FormPreferences::LnFmisc::update() } -FormPreferences::OutputsMisc::OutputsMisc( FormPreferences & p ) +FormPreferences::OutputsMisc::OutputsMisc(FormPreferences & p) : parent_(p) {} @@ -2029,7 +2033,7 @@ void FormPreferences::OutputsMisc::update() } -FormPreferences::Paths::Paths( FormPreferences & p ) +FormPreferences::Paths::Paths(FormPreferences & p) : parent_(p) {} @@ -2450,7 +2454,7 @@ void FormPreferences::Printer::update() } -FormPreferences::ScreenFonts::ScreenFonts( FormPreferences & p ) +FormPreferences::ScreenFonts::ScreenFonts(FormPreferences & p) : parent_(p) {} @@ -2758,7 +2762,7 @@ void FormPreferences::ScreenFonts::update() -FormPreferences::SpellOptions::SpellOptions( FormPreferences & p ) +FormPreferences::SpellOptions::SpellOptions(FormPreferences & p) : parent_(p) {} diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h index 2952926758..2dcb6c4190 100644 --- a/src/frontends/xforms/FormPreferences.h +++ b/src/frontends/xforms/FormPreferences.h @@ -89,11 +89,11 @@ private: /// The preemptive handler for feedback messages. void Feedback(FL_OBJECT *, int); /// Print a warning message and set warning flag. - void printWarning( string const & ); + void printWarning(string const &); /** Launch a file dialog and modify input if it returns a new file. For an explanation of the various parameters, see xforms_helpers.h. */ - void browse( FL_OBJECT * input, + void browse(FL_OBJECT * input, string const & title, string const & pattern, std::pair const & dir1= std::make_pair(string(),string()), std::pair const & dir2 = std::make_pair(string(),string())); @@ -156,7 +156,7 @@ private: GUI_COLOR_CURSOR = FL_FREE_COL3 }; /// - Colors( FormPreferences & p ); + Colors(FormPreferences & p); /// FD_form_colors const * dialog(); /// @@ -175,7 +175,7 @@ private: private: /// - void AdjustVal( int, int, double ) const; + void AdjustVal(int, int, double) const; /// void InputBrowserLyX() const; /// @@ -208,7 +208,7 @@ private: class Converters { public: /// - Converters( FormPreferences & p ); + Converters(FormPreferences & p); /// FD_form_converters const * dialog(); /// @@ -218,7 +218,7 @@ private: /// string const feedback(FL_OBJECT const * const) const; /// - bool input( FL_OBJECT const * const ); + bool input(FL_OBJECT const * const); /// void update(); /// @@ -252,7 +252,7 @@ private: class Formats { public: /// - Formats( FormPreferences & p ); + Formats(FormPreferences & p); /// FD_form_formats const * dialog(); /// @@ -262,7 +262,7 @@ private: /// string const feedback(FL_OBJECT const * const) const; /// - bool input( FL_OBJECT const * const ); + bool input(FL_OBJECT const * const); /// void update(); @@ -290,7 +290,7 @@ private: class InputsMisc { public: /// - InputsMisc( FormPreferences & p ); + InputsMisc(FormPreferences & p); /// FD_form_inputs_misc const * dialog(); /// @@ -315,7 +315,7 @@ private: class Interface { public: /// - Interface( FormPreferences & p ); + Interface(FormPreferences & p); /// FD_form_interface const * dialog(); /// @@ -325,7 +325,7 @@ private: /// string const feedback(FL_OBJECT const * const) const; /// - bool input( FL_OBJECT const * const ); + bool input(FL_OBJECT const * const); /// void update(); @@ -342,7 +342,7 @@ private: class Language { public: /// - Language( FormPreferences & p ); + Language(FormPreferences & p); /// FD_form_language const * dialog(); /// @@ -352,7 +352,7 @@ private: /// string const feedback(FL_OBJECT const * const) const; /// - bool input( FL_OBJECT const * const ); + bool input(FL_OBJECT const * const); /// void update(); /// @@ -373,7 +373,7 @@ private: class LnFmisc { public: /// - LnFmisc( FormPreferences & p ); + LnFmisc(FormPreferences & p); /// FD_form_lnf_misc const * dialog(); /// @@ -398,7 +398,7 @@ private: class OutputsMisc { public: /// - OutputsMisc( FormPreferences & p ); + OutputsMisc(FormPreferences & p); /// FD_form_outputs_misc const * dialog(); /// @@ -423,7 +423,7 @@ private: class Paths { public: /// - Paths( FormPreferences & p ); + Paths(FormPreferences & p); /// FD_form_paths const * dialog(); /// @@ -450,7 +450,7 @@ private: class Printer { public: /// - Printer( FormPreferences & p ); + Printer(FormPreferences & p); /// FD_form_printer const * dialog(); /// @@ -475,7 +475,7 @@ private: class ScreenFonts { public: /// - ScreenFonts( FormPreferences & p ); + ScreenFonts(FormPreferences & p); /// FD_form_screen_fonts const * dialog(); /// @@ -502,7 +502,7 @@ private: class SpellOptions { public: /// - SpellOptions( FormPreferences & p ); + SpellOptions(FormPreferences & p); /// FD_form_spelloptions const * dialog(); /// diff --git a/src/frontends/xforms/FormSpellchecker.C b/src/frontends/xforms/FormSpellchecker.C index 396c1399eb..9779085267 100644 --- a/src/frontends/xforms/FormSpellchecker.C +++ b/src/frontends/xforms/FormSpellchecker.C @@ -120,7 +120,7 @@ void FormSpellchecker::partialUpdate(int id) fl_set_input(dialog_->input, w.c_str()); fl_set_object_label(dialog_->text, w.c_str()); fl_clear_browser(dialog_->browser); - while ( !(w = controller().getSuggestion()).empty() ) { + while (!(w = controller().getSuggestion()).empty()) { fl_add_browser_line(dialog_->browser, w.c_str()); } } diff --git a/src/frontends/xforms/FormTabular.C b/src/frontends/xforms/FormTabular.C index 9f9afcb501..4079decf54 100644 --- a/src/frontends/xforms/FormTabular.C +++ b/src/frontends/xforms/FormTabular.C @@ -21,15 +21,23 @@ #include "form_tabular.h" #include "LyXView.h" #include "Dialogs.h" -#include "insets/insettabular.h" #include "buffer.h" #include "xforms_helpers.h" #include "lyxrc.h" // to set the default length values #include "helper_funcs.h" #include "input_validators.h" + +#include "insets/insettabular.h" + #include "support/lstrings.h" +#include + + using SigC::slot; +using std::vector; +using std::bind2nd; + FormTabular::FormTabular(LyXView * lv, Dialogs * d) : FormInset(lv, d, _("Tabular Layout")), @@ -45,7 +53,7 @@ FormTabular::FormTabular(LyXView * lv, Dialogs * d) void FormTabular::redraw() { - if(form() && form()->visible) + if (form() && form()->visible) fl_redraw_form(form()); else return; @@ -137,12 +145,21 @@ void FormTabular::build() // Create the contents of the unit choices // Don't include the "%" terms... - std::vector units_vec = getLatexUnits(); - for (std::vector::iterator it = units_vec.begin(); + vector units_vec = getLatexUnits(); +#if 0 + for (vector::iterator it = units_vec.begin(); it != units_vec.end(); ++it) { if (contains(*it, "%")) it = units_vec.erase(it, it + 1) - 1; } +#else + vector::iterator ret = + remove_if(units_vec.begin(), + units_vec.end(), + bind2nd(contains_functor(), "%")); + units_vec.erase(ret, units_vec.end()); +#endif + string units = getStringFromVector(units_vec, "|"); fl_addto_choice(column_options_->choice_value_column_width, diff --git a/src/frontends/xforms/FormTabularCreate.C b/src/frontends/xforms/FormTabularCreate.C index 2ec372345c..e7a297e7cd 100644 --- a/src/frontends/xforms/FormTabularCreate.C +++ b/src/frontends/xforms/FormTabularCreate.C @@ -23,6 +23,10 @@ #include "form_tabular_create.h" #include "support/lstrings.h" + +using std::make_pair; + + typedef FormCB > base_class; FormTabularCreate::FormTabularCreate(ControlTabularCreate & c) @@ -53,5 +57,5 @@ void FormTabularCreate::apply() unsigned int ysize = (unsigned int)(fl_get_slider_value(dialog_->slider_columns) + 0.5); unsigned int xsize = (unsigned int)(fl_get_slider_value(dialog_->slider_rows) + 0.5); - controller().params() = std::make_pair(xsize, ysize); + controller().params() = make_pair(xsize, ysize); } diff --git a/src/frontends/xforms/FormTexinfo.C b/src/frontends/xforms/FormTexinfo.C index 8efff8ca8d..75b32d911c 100644 --- a/src/frontends/xforms/FormTexinfo.C +++ b/src/frontends/xforms/FormTexinfo.C @@ -85,7 +85,7 @@ ButtonPolicy::SMInput FormTexinfo::input(FL_OBJECT * ob, long) { unsigned int selection = fl_get_browser(dialog_->browser); // a valid entry? if (selection > 0) { - controller().viewFile( + controller().viewFile( fl_get_browser_line(dialog_->browser, selection)); } diff --git a/src/frontends/xforms/FormThesaurus.C b/src/frontends/xforms/FormThesaurus.C index b168ee56e1..734a14ece9 100644 --- a/src/frontends/xforms/FormThesaurus.C +++ b/src/frontends/xforms/FormThesaurus.C @@ -21,6 +21,10 @@ #include "form_thesaurus.h" #include "debug.h" + +using std::vector; + + typedef FormCB > base_class; FormThesaurus::FormThesaurus(ControlThesaurus & c) @@ -65,17 +69,23 @@ void FormThesaurus::updateMeanings(string const & str) fl_freeze_form(form()); Thesaurus::Meanings meanings = controller().getMeanings(str); - - for (Thesaurus::Meanings::const_iterator cit = meanings.begin(); - cit != meanings.end(); ++cit) { - fl_add_browser_line(dialog_->browser_meanings, cit->first.c_str()); - for (std::vector::const_iterator cit2 = cit->second.begin(); - cit2 != cit->second.end(); ++cit2) { - string ent = " "; - ent += *cit2; - fl_add_browser_line(dialog_->browser_meanings, ent.c_str()); - } + + Thesaurus::Meanings::const_iterator cit = meanings.begin(); + Thesaurus::Meanings::const_iterator end = meanings.end(); + for (; cit != end; ++cit) { + fl_add_browser_line(dialog_->browser_meanings, + cit->first.c_str()); + + vector const & tmpvec = cit->second; + vector::const_iterator cit2 = tmpvec.begin(); + vector::const_iterator end2 = tmpvec.end(); + for (; cit2 != end2; ++cit2) { + string ent = " "; + ent += *cit2; + fl_add_browser_line(dialog_->browser_meanings, + ent.c_str()); } + } fl_unfreeze_form(form()); fl_redraw_form(form()); @@ -92,10 +102,13 @@ void FormThesaurus::setReplace(string const & templ, string const & nstr) bool all_lower = true; bool all_upper = true; - for (string::const_iterator it = templ.begin(); it != templ.end(); ++it) { - if (isupper(*it)) + string::const_iterator beg = templ.begin(); + string::const_iterator end = templ.end(); + string::const_iterator cit = beg; + for (; cit != end; ++cit) { + if (isupper(*cit)) all_lower = false; - if (islower(*it)) + if (islower(*cit)) all_upper = false; } @@ -105,9 +118,10 @@ void FormThesaurus::setReplace(string const & templ, string const & nstr) str = uppercase(nstr); } else if (templ.size() > 0 && isupper(templ[0])) { bool rest_lower = true; - for (string::const_iterator it = templ.begin() + 1; - it != templ.end(); ++it) { - if (isupper(*it)) + string::const_iterator cit2 = beg + 1; + + for (; cit2 != end; ++cit2) { + if (isupper(*cit2)) rest_lower = false; } diff --git a/src/frontends/xforms/FormToc.C b/src/frontends/xforms/FormToc.C index c165545e79..11a5c322b2 100644 --- a/src/frontends/xforms/FormToc.C +++ b/src/frontends/xforms/FormToc.C @@ -66,7 +66,7 @@ ButtonPolicy::SMInput FormToc::input(FL_OBJECT * ob, long) updateContents(); - unsigned int const choice = fl_get_browser( dialog_->browser_toc ); + unsigned int const choice = fl_get_browser(dialog_->browser_toc); if (choice - 1 < toclist_.size() && choice >= 1) { controller().Goto(toclist_[choice - 1].par->id()); @@ -134,7 +134,7 @@ void FormToc::updateContents() fl_get_browser_topline(dialog_->browser_toc); unsigned int const line = fl_get_browser(dialog_->browser_toc); - fl_clear_browser( dialog_->browser_toc ); + fl_clear_browser(dialog_->browser_toc); Buffer::SingleList::const_iterator cit = toclist_.begin(); Buffer::SingleList::const_iterator end = toclist_.end(); diff --git a/src/frontends/xforms/GUIRunTime.C b/src/frontends/xforms/GUIRunTime.C index 9d4305856a..423dd12306 100644 --- a/src/frontends/xforms/GUIRunTime.C +++ b/src/frontends/xforms/GUIRunTime.C @@ -27,7 +27,10 @@ If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C. #endif + using std::endl; +using std::hex; + extern bool finished; @@ -74,8 +77,8 @@ void GUIRunTime::processEvents() XEvent ev; fl_XNextEvent(&ev); lyxerr << "Received unhandled X11 event" << endl; - lyxerr << "Type: 0x" << std::hex << ev.xany.type << - "Target: 0x" << std::hex << ev.xany.window << endl; + lyxerr << "Type: 0x" << hex << ev.xany.type << + "Target: 0x" << hex << ev.xany.window << endl; } } @@ -87,8 +90,8 @@ void GUIRunTime::runTime() XEvent ev; fl_XNextEvent(&ev); lyxerr << "Received unhandled X11 event" << endl; - lyxerr << "Type: 0x" << std::hex << ev.xany.type << - "Target: 0x" << std::hex << ev.xany.window << endl; + lyxerr << "Type: 0x" << hex << ev.xany.type << + "Target: 0x" << hex << ev.xany.window << endl; } } } diff --git a/src/frontends/xforms/Makefile.am b/src/frontends/xforms/Makefile.am index 5c002c5251..896dc72350 100644 --- a/src/frontends/xforms/Makefile.am +++ b/src/frontends/xforms/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 DISTCLEANFILES= *.orig *.rej *~ *.bak core MAINTAINERCLEANFILES = $(srcdir)/Makefile.in -noinst_LTLIBRARIES = libxforms.la +noinst_LTLIBRARIES = libxforms.o BOOST_INCLUDES = -I$(top_srcdir)/boost INCLUDES = -I${top_srcdir}/images -I${top_srcdir}/src/ \ -I${top_srcdir}/src/frontends/ \ @@ -12,7 +12,7 @@ LDFLAGS= LYXDATADIRS = forms ETAGS_ARGS = --lang=c++ # Alphabetical order please. It makes it easier to figure out what's missing. -libxforms_la_SOURCES = \ +libxforms_o_SOURCES = \ Alert_pimpl.C \ bmtable.c \ bmtable.h \ @@ -205,7 +205,13 @@ libxforms_la_SOURCES = \ # GUI_runtime.C \ # GUI_applymenu.C -libxforms_la_LIBADD = @LYX_LIBS@ @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@ +libxforms_o_LIBADD = @LYX_LIBS@ @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@ + +libxforms.o: $(libxforms_o_OBJECTS) $(libxforms_o_DEPENDENCIES) + rm -f ../libxforms.objects + for fil in $(libxforms_o_OBJECTS) ; do \ + echo xforms/$$fil >> ../libxforms.objects ; \ + done # for convenience only updatesrc: diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C index 4f48be04aa..aa36561095 100644 --- a/src/frontends/xforms/Menubar_pimpl.C +++ b/src/frontends/xforms/Menubar_pimpl.C @@ -33,6 +33,7 @@ using std::endl; using std::vector; using std::max; using std::min; +using std::for_each; typedef vector::size_type size_type; @@ -384,7 +385,7 @@ int Menubar::Pimpl::create_submenu(Window win, LyXView * view, string const & menu_name, vector & smn) { - if (!menubackend_->hasMenu(menu_name)){ + if (!menubackend_->hasMenu(menu_name)) { lyxerr << "ERROR:create_submenu: Unknown menu `" << menu_name << "'" << endl; return -1; @@ -591,7 +592,7 @@ void Menubar::Pimpl::MenuCallback(FL_OBJECT * ob, long button) lyxerr << "Error in MenuCallback" << endl; } - std::for_each(submenus.begin(), submenus.end(), fl_freepup); + for_each(submenus.begin(), submenus.end(), fl_freepup); // restore tabstop length fl_set_tabstop(default_tabstop); diff --git a/src/frontends/xforms/RadioButtonGroup.C b/src/frontends/xforms/RadioButtonGroup.C index 21fdb673b0..007e772570 100644 --- a/src/frontends/xforms/RadioButtonGroup.C +++ b/src/frontends/xforms/RadioButtonGroup.C @@ -10,10 +10,6 @@ #include -#include -#include -#include - #ifdef __GNUG__ #pragma implementation #endif @@ -21,14 +17,20 @@ #include "RadioButtonGroup.h" #include "debug.h" // for lyxerr +#include "support/lyxfunctional.h" + +//#include +#include +#include using std::find_if; -using std::bind2nd; +//using std::bind2nd; using std::endl; + void RadioButtonGroup::registerRadioButton(FL_OBJECT *button, int value) { - map.push_back( ButtonValuePair(button, value) ); + map.push_back(ButtonValuePair(button, value)); } @@ -37,6 +39,8 @@ void RadioButtonGroup::reset() map.clear(); } + +#if 0 // Functor to help us in our work, we should try to find how to achieve // this with only STL predicates, but its easier to write this than to // dig. If you can find the equivalent STL predicate combination, let me @@ -58,14 +62,22 @@ struct equal_to_second_in_pair return left.second == right; } }; +#endif + void RadioButtonGroup::setButton(int value) { +#if 0 ButtonValueMap::const_iterator it = find_if(map.begin(), map.end(), - bind2nd(equal_to_second_in_pair < ButtonValuePair > (), + bind2nd(equal_to_second_in_pair(), value)); - +#else + ButtonValueMap::const_iterator it = + find_if(map.begin(), map.end(), + lyx::equal_2nd_in_pair(value)); +#endif + // If we found nothing, report it and return if (it == map.end()) { lyxerr << "BUG: Requested value in RadioButtonGroup doesn't exists" @@ -77,20 +89,22 @@ void RadioButtonGroup::setButton(int value) } + template < typename T > struct is_set_button { bool operator() (T const & item) const { - return fl_get_button( (item).first ); + return fl_get_button((item).first); } }; + int RadioButtonGroup::getButton() { // Find the first button that is active ButtonValueMap::iterator it = find_if(map.begin(), map.end(), - is_set_button < ButtonValuePair > () ); + is_set_button ()); // If such a button was found, return its value. if (it != map.end()) { diff --git a/src/frontends/xforms/RadioButtonGroup.h b/src/frontends/xforms/RadioButtonGroup.h index ca3a9104ce..2b5623deb6 100644 --- a/src/frontends/xforms/RadioButtonGroup.h +++ b/src/frontends/xforms/RadioButtonGroup.h @@ -22,9 +22,6 @@ #pragma interface #endif -using std::vector; -using std::pair; - /** This class simplifies the work with a group of radio buttons, * the idea is that you register a bunch of radio buttons with the accompanying @@ -38,7 +35,7 @@ public: RadioButtonGroup(unsigned n = 5) : map(n) {}; /// Register a radio button with it's corresponding value. - void registerRadioButton(FL_OBJECT *button, int value); + void registerRadioButton(FL_OBJECT * button, int value); /// Reset registrations. void reset(); @@ -50,9 +47,9 @@ public: private: /// - typedef pair ButtonValuePair; + typedef std::pair ButtonValuePair; /// - typedef vector ButtonValueMap; + typedef std::vector ButtonValueMap; /// ButtonValueMap map; }; diff --git a/src/frontends/xforms/Toolbar_pimpl.C b/src/frontends/xforms/Toolbar_pimpl.C index 9d5471d395..6bf013398c 100644 --- a/src/frontends/xforms/Toolbar_pimpl.C +++ b/src/frontends/xforms/Toolbar_pimpl.C @@ -130,13 +130,13 @@ int BubblePost(FL_OBJECT *ob, int event, FL_OBJECT * bubble_timer = reinterpret_cast(ob->u_cdata); // We do not test for empty help here, since this can never happen - if (event == FL_ENTER){ + if (event == FL_ENTER) { fl_set_object_callback(bubble_timer, C_Toolbar_BubbleTimerCB, reinterpret_cast(ob)); fl_set_timer(bubble_timer, 1); } - else if (event != FL_MOTION){ + else if (event != FL_MOTION) { fl_set_timer(bubble_timer, 0); fl_hide_oneliner(); } @@ -390,7 +390,7 @@ void Toolbar::Pimpl::set(bool doingmain) ToolbarList::iterator item = toollist.begin(); ToolbarList::iterator end = toollist.end(); for (; item != end; ++item) { - switch (item->action){ + switch (item->action) { case ToolbarDefaults::SEPARATOR: xpos += sepspace; break; diff --git a/src/frontends/xforms/Tooltips.C b/src/frontends/xforms/Tooltips.C index ef82135d45..0227775044 100644 --- a/src/frontends/xforms/Tooltips.C +++ b/src/frontends/xforms/Tooltips.C @@ -107,13 +107,13 @@ int TooltipHandler(FL_OBJECT *ob, int event) lyx::Assert(timer); // We do not test for empty help here, since this can never happen - if (event == FL_ENTER){ + if (event == FL_ENTER) { fl_set_object_callback(timer, C_TooltipTimerCB, reinterpret_cast(ob)); fl_set_timer(timer, 1); } - else if (event != FL_MOTION){ + else if (event != FL_MOTION) { fl_set_timer(timer, 0); fl_hide_oneliner(); } diff --git a/src/frontends/xforms/combox.C b/src/frontends/xforms/combox.C index 188b5cff71..c4b30bbcfe 100644 --- a/src/frontends/xforms/combox.C +++ b/src/frontends/xforms/combox.C @@ -235,7 +235,8 @@ void Combox::add(int x, int y, int w, int hmin, int hmax, FL_FORM * current_form = fl_current_form; fl_end_form(); - bw = w + 20; bh = hmax - hmin - 12; + bw = w + 20; + bh = hmax - hmin - 12; form = fl_bgn_form(FL_NO_BOX, bw, bh); browser = obj = fl_add_browser(FL_HOLD_BROWSER, 0, 0, bw, bh, ""); @@ -291,14 +292,14 @@ void Combox::show() int folder_x, folder_y, folder_w, folder_h; fl_get_folder_area( tabfolder1, &folder_x, &folder_y, - &folder_w, &folder_h ); + &folder_w, &folder_h); x += folder_x; y += folder_y; if (tabfolder2) { fl_get_folder_area( tabfolder2, &folder_x, &folder_y, - &folder_w, &folder_h ); + &folder_w, &folder_h); x += tabfolder2->form->x + folder_x; y += tabfolder2->form->y + folder_y; } else { @@ -313,7 +314,7 @@ void Combox::show() fl_set_form_position(form, x, y); fl_show_form(form, FL_PLACE_POSITION, FL_NOBORDER, ""); - if (sel>0) { + if (sel > 0) { fl_set_browser_topline(browser, sel); fl_select_browser_line(browser, sel); } @@ -345,7 +346,7 @@ void Combox::hide(int who) XFlush(fl_get_display()); } if (button) { - if (type != FL_COMBOX_NORMAL){ + if (type != FL_COMBOX_NORMAL) { fl_set_object_label(button, "@2->"); fl_redraw_object(button); } diff --git a/src/frontends/xforms/xforms_helpers.C b/src/frontends/xforms/xforms_helpers.C index ea150ba2e2..2edbb87f75 100644 --- a/src/frontends/xforms/xforms_helpers.C +++ b/src/frontends/xforms/xforms_helpers.C @@ -318,7 +318,7 @@ string formatted(string const & sin, int w, int size, int style) } // Flush remaining contents of word - if (!word.empty() ) sentence.push_back(word); + if (!word.empty()) sentence.push_back(word); string line; string line_plus_word; @@ -334,7 +334,7 @@ string formatted(string const & sin, int w, int size, int style) line.erase(); } - if (!line_plus_word.empty() ) line_plus_word += ' '; + if (!line_plus_word.empty()) line_plus_word += ' '; line_plus_word += word; int const length = fl_get_string_width(style, size, diff --git a/src/graphics/GraphicsCacheItem.C b/src/graphics/GraphicsCacheItem.C index 918dfc2c67..a6ebdcc1ca 100644 --- a/src/graphics/GraphicsCacheItem.C +++ b/src/graphics/GraphicsCacheItem.C @@ -15,21 +15,24 @@ #pragma implementation #endif -#include "graphics/GraphicsCache.h" #include "graphics/GraphicsCacheItem.h" -#include "frontends/support/LyXImage.h" +#include "graphics/GraphicsCache.h" #include "graphics/ImageLoaderXPM.h" #include "converter.h" -#include "support/filetools.h" -#include "support/lyxlib.h" #include "lyx_gui_misc.h" #include "debug.h" #include "support/LAssert.h" #include "gettext.h" #include "lyxfunc.h" +#include "frontends/support/LyXImage.h" + +#include "support/filetools.h" +#include "support/lyxlib.h" + using std::endl; + /* * The order of conversion: * @@ -47,12 +50,10 @@ using std::endl; */ GraphicsCacheItem::GraphicsCacheItem(string const & filename) - : imageStatus_(GraphicsCacheItem::Loading) + : filename_(filename), imageStatus_(GraphicsCacheItem::Loading) { - filename_ = filename; - bool success = convertImage(filename); - if (! success) // Conversion failed miserably (couldn't even start). + if (!success) // Conversion failed miserably (couldn't even start). setStatus(ErrorConverting); } @@ -62,7 +63,10 @@ GraphicsCacheItem::~GraphicsCacheItem() GraphicsCacheItem::ImageStatus -GraphicsCacheItem::getImageStatus() const { return imageStatus_; } +GraphicsCacheItem::getImageStatus() const +{ + return imageStatus_; +} void GraphicsCacheItem::setStatus(ImageStatus new_status) @@ -72,7 +76,10 @@ void GraphicsCacheItem::setStatus(ImageStatus new_status) LyXImage * -GraphicsCacheItem::getImage() const { return image_.get(); } +GraphicsCacheItem::getImage() const +{ + return image_.get(); +} void GraphicsCacheItem::imageConverted(bool success) @@ -112,7 +119,7 @@ string const findTargetFormat(string const & from) } if (iter == end) { // We do not know how to convert the image to something loadable. - lyxerr << "ERROR: Do not know how to convert image." << std::endl; + lyxerr << "ERROR: Do not know how to convert image." << endl; return string(); } return (*iter); @@ -124,6 +131,8 @@ string const findTargetFormat(string const & from) bool GraphicsCacheItem::convertImage(string const & filename) { setStatus(GraphicsCacheItem::Converting); +#warning shadowing class variable (Lgb) + // Is this needed at all? string filename_ = string(filename); lyxerr << "try to convert image file: " << filename_ << endl; // maybe that other zip extensions also be useful, especially the @@ -173,7 +182,7 @@ bool GraphicsCacheItem::convertImage(string const & filename) lyx::unlink(tempfile); if (zipped) lyx::unlink(filename_); - tempfile = string(); + tempfile.erase(); return true; } diff --git a/src/graphics/ImageLoaderXPM.C b/src/graphics/ImageLoaderXPM.C index 720041ded5..94db3f9473 100644 --- a/src/graphics/ImageLoaderXPM.C +++ b/src/graphics/ImageLoaderXPM.C @@ -7,31 +7,36 @@ * * ================================================= */ +#include + #ifdef __GNUG__ #pragma implementation #endif -#include #include "ImageLoaderXPM.h" #include "ColorHandler.h" #include "lyxrc.h" +#include "debug.h" + #include "frontends/support/LyXImage.h" #include "frontends/GUIRunTime.h" + #include "support/filetools.h" +#include "support/LAssert.h" #include XPM_H_LOCATION #include #include -#include "support/LAssert.h" -#include "debug.h" +using std::ifstream; using std::endl; using std::ios; + bool ImageLoaderXPM::isImageFormatOK(string const & filename) const { - std::ifstream is(filename.c_str(), ios::in); + ifstream is(filename.c_str(), ios::in); // The signature of the file without the spaces. static char const str[] = "/*XPM*/"; @@ -48,6 +53,7 @@ bool ImageLoaderXPM::isImageFormatOK(string const & filename) const return true; } + ImageLoaderXPM::FormatList const ImageLoaderXPM::loadableFormats() const { @@ -56,7 +62,8 @@ ImageLoaderXPM::loadableFormats() const return formats; } - + + ImageLoader::Result ImageLoaderXPM::runImageLoader(string const & filename) { diff --git a/src/graphics/Makefile.am b/src/graphics/Makefile.am index ce0b4c0b64..dd6d51661e 100644 --- a/src/graphics/Makefile.am +++ b/src/graphics/Makefile.am @@ -1,13 +1,13 @@ AUTOMAKE_OPTIONS = foreign DISTCLEANFILES= *.orig *.rej *~ *.bak core MAINTAINERCLEANFILES = $(srcdir)/Makefile.in -noinst_LTLIBRARIES = libgraphics.la +noinst_LTLIBRARIES = libgraphics.o LIBS = ETAGS_ARGS = --lang=c++ BOOST_INCLUDES = -I$(top_srcdir)/boost INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES) -libgraphics_la_SOURCES = \ +libgraphics_o_SOURCES = \ GraphicsCache.h \ GraphicsCache.C \ GraphicsCacheItem.h \ diff --git a/src/insets/ExternalTemplate.C b/src/insets/ExternalTemplate.C index da8fdf5063..cdf429ea22 100644 --- a/src/insets/ExternalTemplate.C +++ b/src/insets/ExternalTemplate.C @@ -52,7 +52,7 @@ ExternalTemplateManager::ExternalTemplateManager() class dumpTemplate { public: - dumpTemplate(std::ostream & o) + dumpTemplate(ostream & o) : ost(o) {} void operator()(ExternalTemplateManager::Templates::value_type const & vt) { ExternalTemplate const & et = vt.second; diff --git a/src/insets/Makefile.am b/src/insets/Makefile.am index 8ef545437a..a2599e0844 100644 --- a/src/insets/Makefile.am +++ b/src/insets/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign DISTCLEANFILES= *.orig *.rej *~ *.bak core MAINTAINERCLEANFILES = $(srcdir)/Makefile.in -noinst_LTLIBRARIES = libinsets.la +noinst_LTLIBRARIES = libinsets.o LIBS = ETAGS_ARGS = --lang=c++ BOOST_INCLUDES = -I$(top_srcdir)/boost @@ -15,7 +15,7 @@ EXTRA_DIST = \ insettheorem.C \ insettheorem.h -libinsets_la_SOURCES = \ +libinsets_o_SOURCES = \ ExternalTemplate.C \ ExternalTemplate.h \ figinset.C \ diff --git a/src/insets/figinset.C b/src/insets/figinset.C index 56898a86d5..9bf32f5e6b 100644 --- a/src/insets/figinset.C +++ b/src/insets/figinset.C @@ -28,46 +28,47 @@ #include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include FORMS_H_LOCATION -#include -#include -#include -#include - #include "figinset.h" + #include "lyx_main.h" #include "buffer.h" -#include "frontends/FileDialog.h" -#include "support/filetools.h" #include "LyXView.h" // just because of form_main #include "debug.h" #include "LaTeXFeatures.h" #include "lyxrc.h" #include "gettext.h" #include "lyx_gui_misc.h" // CancelCloseBoxCB -#include "frontends/Alert.h" -#include "support/FileInfo.h" -#include "support/lyxlib.h" -#include "support/os.h" #include "Painter.h" #include "font.h" #include "bufferview_funcs.h" #include "ColorHandler.h" #include "converter.h" -#include "frontends/Dialogs.h" // redrawGUI #include "BufferView.h" +#include "frontends/FileDialog.h" +#include "frontends/Alert.h" +#include "frontends/Dialogs.h" // redrawGUI + +#include "support/FileInfo.h" +#include "support/lyxlib.h" +#include "support/os.h" +#include "support/filetools.h" + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + using std::ostream; using std::istream; using std::ofstream; @@ -82,6 +83,7 @@ using std::copy; using std::pair; using std::make_pair; using std::ios; +using std::ostream_iterator; #ifndef CXX_GLOBAL_CSTD using std::memcpy; @@ -158,7 +160,7 @@ void addpidwait(int pid) if (lyxerr.debugging()) { lyxerr << "Pids to wait for: \n"; copy(pidwaitlist.begin(), pidwaitlist.end(), - std::ostream_iterator(lyxerr, "\n")); + ostream_iterator(lyxerr, "\n")); lyxerr << flush; } } @@ -419,10 +421,10 @@ void InitFigures() vi->visualid, vi->c_class, vi->bits_per_rgb, vi->map_entries); } - color_visual = ( (vi->c_class == StaticColor) || + color_visual = ((vi->c_class == StaticColor) || (vi->c_class == PseudoColor) || (vi->c_class == TrueColor) || - (vi->c_class == DirectColor) ); + (vi->c_class == DirectColor)); if ((vi->c_class & 1) == 0) return; // now allocate colors if (vi->c_class == GrayScale) { @@ -647,7 +649,7 @@ void runqueue() env = new char_p[ne + 2]; string tmp = t2.str().c_str(); env[0] = new char[tmp.size() + 1]; - std::copy(tmp.begin(), tmp.end(), env[0]); + copy(tmp.begin(), tmp.end(), env[0]); env[0][tmp.size()] = '\0'; memcpy(&env[1], environ, sizeof(char*) * (ne + 1)); @@ -1924,7 +1926,7 @@ void InsetFig::restoreForm() fl_set_input(form->Width, tostr(xwid).c_str()); fl_set_input(form->Height, tostr(xhgh).c_str()); fl_set_input(form->Angle, tostr(angle).c_str()); - if (!fname.empty()){ + if (!fname.empty()) { string buf1 = OnlyPath(owner->fileName()); string fname2 = MakeRelPath(fname, buf1); fl_set_input(form->EpsFile, fname2.c_str()); diff --git a/src/insets/figinset.h b/src/insets/figinset.h index 73d70d95d1..02000371d9 100644 --- a/src/insets/figinset.h +++ b/src/insets/figinset.h @@ -7,6 +7,7 @@ #ifndef FIGINSET_H #define FIGINSET_H +#include FORMS_H_LOCATION #include "figure_form.h" #include "LString.h" #include "buffer.h" diff --git a/src/insets/inset.C b/src/insets/inset.C index 6f25f38709..c8eba90eb3 100644 --- a/src/insets/inset.C +++ b/src/insets/inset.C @@ -142,7 +142,7 @@ void Inset::id(int id_arg) id_ = id_arg; } -void Inset::setFont(BufferView *, LyXFont const &, bool, bool ) +void Inset::setFont(BufferView *, LyXFont const &, bool, bool) {} @@ -328,7 +328,7 @@ UpdatableInset::localDispatch(BufferView * bv, int UpdatableInset::getMaxWidth(BufferView * bv, UpdatableInset const *) const { int w; - if (owner()){ + if (owner()) { w = static_cast (owner())->getMaxWidth(bv, this); } else { diff --git a/src/insets/insetbib.C b/src/insets/insetbib.C index 03adf89137..d314ad7013 100644 --- a/src/insets/insetbib.C +++ b/src/insets/insetbib.C @@ -252,7 +252,7 @@ vector > const InsetBibtex::getKeys(Buffer const * buffer) string linebuf0; while (getline(ifs, linebuf0)) { string linebuf = frontStrip(strip(linebuf0)); - if (linebuf.empty() ) continue; + if (linebuf.empty()) continue; if (prefixIs(linebuf, "@")) { linebuf = subst(linebuf, '{', '('); string tmp; diff --git a/src/insets/insetcite.C b/src/insets/insetcite.C index 7772349b6a..6eedb6df8c 100644 --- a/src/insets/insetcite.C +++ b/src/insets/insetcite.C @@ -18,9 +18,15 @@ #include "BufferView.h" #include "LaTeXFeatures.h" #include "LyXView.h" + #include "frontends/Dialogs.h" + #include "support/lstrings.h" + +using std::ostream; + + InsetCitation::InsetCitation(InsetCommandParams const & p, bool) : InsetCommand(p) {} @@ -36,7 +42,7 @@ string const InsetCitation::getScreenLabel(Buffer const *) const keys = frontStrip(split(keys, label, ',')) + ","; string::size_type const maxSize = 40; - while (contains( keys, "," )) { + while (contains(keys, ",")) { string key; keys = frontStrip(split(keys, key, ',')); @@ -68,7 +74,7 @@ void InsetCitation::edit(BufferView * bv, bool) edit(bv, 0, 0, 0); } -int InsetCitation::ascii(Buffer const *, std::ostream & os, int) const +int InsetCitation::ascii(Buffer const *, ostream & os, int) const { os << "[" << getContents() << "]"; return 0; @@ -78,7 +84,7 @@ int InsetCitation::ascii(Buffer const *, std::ostream & os, int) const // the \cite command is valid. Eg, the user has natbib enabled, inputs some // citations and then changes his mind, turning natbib support off. The output // should revert to \cite[]{} -int InsetCitation::latex(Buffer const * buffer, std::ostream & os, +int InsetCitation::latex(Buffer const * buffer, ostream & os, bool /*fragile*/, bool/*fs*/) const { os << "\\"; diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C index d05f943ba2..e4015dd1cf 100644 --- a/src/insets/insetcollapsable.C +++ b/src/insets/insetcollapsable.C @@ -19,21 +19,25 @@ #include "lyxfont.h" #include "BufferView.h" #include "Painter.h" -#include "insets/insettext.h" -#include "support/LOstream.h" -#include "support/lstrings.h" #include "debug.h" #include "lyxtext.h" #include "font.h" #include "lyxlex.h" -class LyXText; +#include "insets/insettext.h" +#include "support/LOstream.h" +#include "support/lstrings.h" + +using std::vector; using std::ostream; using std::endl; using std::max; +class LyXText; + + InsetCollapsable::InsetCollapsable(bool collapsed) : UpdatableInset(), collapsed_(collapsed), button_length(0), button_top_y(0), button_bottom_y(0), @@ -382,19 +386,19 @@ int InsetCollapsable::latex(Buffer const * buf, ostream & os, } -int InsetCollapsable::ascii(Buffer const *buf, std::ostream & os, int ll) const +int InsetCollapsable::ascii(Buffer const * buf, ostream & os, int ll) const { return inset.ascii(buf, os, ll); } -int InsetCollapsable::linuxdoc(Buffer const *buf, std::ostream & os) const +int InsetCollapsable::linuxdoc(Buffer const * buf, ostream & os) const { return inset.linuxdoc(buf, os); } -int InsetCollapsable::docbook(Buffer const *buf, std::ostream & os) const +int InsetCollapsable::docbook(Buffer const * buf, ostream & os) const { return inset.docbook(buf, os); } @@ -564,7 +568,7 @@ void InsetCollapsable::resizeLyXText(BufferView * bv, bool force) const } -std::vector const InsetCollapsable::getLabelList() const +vector const InsetCollapsable::getLabelList() const { return inset.getLabelList(); } diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C index cb40f395ea..a5d2f391c5 100644 --- a/src/insets/insetcommand.C +++ b/src/insets/insetcommand.C @@ -27,9 +27,9 @@ InsetCommandParams::InsetCommandParams() {} -InsetCommandParams::InsetCommandParams( string const & n, +InsetCommandParams::InsetCommandParams(string const & n, string const & c, - string const & o ) + string const & o) : cmdname(n), contents(c), options(o) {} @@ -40,7 +40,7 @@ string const InsetCommandParams::getAsString() const } -void InsetCommandParams::setFromString( string const & b ) +void InsetCommandParams::setFromString(string const & b) { string::size_type idx = b.find("|++|"); if (idx == string::npos) { @@ -126,9 +126,9 @@ void InsetCommandParams::scanCommand(string const & cmd) } // Don't mess with this. - if (!tcmdname.empty()) setCmdName( tcmdname ); - if (!toptions.empty()) setOptions( toptions ); - if (!tcontents.empty()) setContents( tcontents ); + if (!tcmdname.empty()) setCmdName(tcmdname); + if (!toptions.empty()) setOptions(toptions); + if (!tcontents.empty()) setContents(tcontents); if (lyxerr.debugging(Debug::PARSER)) lyxerr << "Command <" << cmd @@ -181,15 +181,15 @@ string const InsetCommandParams::getCommand() const InsetCommand::InsetCommand(InsetCommandParams const & p, bool) - : p_( p.getCmdName(), p.getContents(), p.getOptions() ) + : p_(p.getCmdName(), p.getContents(), p.getOptions()) {} -void InsetCommand::setParams(InsetCommandParams const & p ) +void InsetCommand::setParams(InsetCommandParams const & p) { - p_.setCmdName( p.getCmdName() ); - p_.setContents( p.getContents() ); - p_.setOptions( p.getOptions() ); + p_.setCmdName(p.getCmdName()); + p_.setContents(p.getContents()); + p_.setOptions(p.getOptions()); } diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h index c0aeaa615b..6428e667fd 100644 --- a/src/insets/insetcommand.h +++ b/src/insets/insetcommand.h @@ -32,7 +32,7 @@ public: InsetCommandParams(); /// explicit - InsetCommandParams( string const & n, + InsetCommandParams(string const & n, string const & c = string(), string const & o = string()); /// @@ -54,7 +54,7 @@ public: /// string const & getContents() const { return contents; } /// - void setCmdName( string const & n) { cmdname = n; } + void setCmdName(string const & n) { cmdname = n; } /// void setOptions(string const & o) { options = o; } /// @@ -62,7 +62,7 @@ public: /// string const getAsString() const; /// - void setFromString( string const & ); + void setFromString(string const &); private: /// string cmdname; @@ -83,12 +83,12 @@ public: virtual ~InsetCommand() { hideDialog(); } /// void write(Buffer const *, std::ostream & os) const - { p_.write( os ); } + { p_.write(os); } /// virtual void read(Buffer const *, LyXLex & lex) - { p_.read( lex ); } + { p_.read(lex); } /// Can remove one InsetBibKey is modified - void scanCommand(string const & c) { p_.scanCommand( c ); }; + void scanCommand(string const & c) { p_.scanCommand(c); }; /// virtual int latex(Buffer const *, std::ostream &, bool fragile, bool free_spc) const; diff --git a/src/insets/inseterror.C b/src/insets/inseterror.C index 611558bcb4..cd4b51737c 100644 --- a/src/insets/inseterror.C +++ b/src/insets/inseterror.C @@ -88,7 +88,7 @@ string const InsetError::editMessage() const void InsetError::edit(BufferView * bv, int, int, unsigned int) { - bv->owner()->getDialogs()->showError( this ); + bv->owner()->getDialogs()->showError(this); } diff --git a/src/insets/insetert.C b/src/insets/insetert.C index 9f3ba06f30..9daea852d7 100644 --- a/src/insets/insetert.C +++ b/src/insets/insetert.C @@ -32,7 +32,11 @@ #include "support/LOstream.h" + using std::ostream; +using std::min; +using std::endl; + using lyx::pos_type; @@ -125,7 +129,7 @@ void InsetERT::read(Buffer const * buf, LyXLex & lex) token_found = true; } else { lyxerr << "InsetERT::Read: Missing 'status'-tag!" - << std::endl; + << endl; // take countermeasures lex.pushToken(token); } @@ -179,7 +183,7 @@ void InsetERT::write(Buffer const * buf, ostream & os) const { string st; - switch(status_) { + switch (status_) { case Open: st = "Open"; break; @@ -207,7 +211,7 @@ void InsetERT::write(Buffer const * buf, ostream & os) const case Paragraph::META_INSET: case Paragraph::META_HFILL: lyxerr << "Element is not allowed in insertERT" - << std::endl; + << endl; case Paragraph::META_NEWLINE: os << "\n\\newline \n"; break; @@ -343,7 +347,7 @@ void InsetERT::insetMotionNotify(BufferView * bv, } -int InsetERT::latex(Buffer const *, std::ostream & os, bool /*fragile*/, +int InsetERT::latex(Buffer const *, ostream & os, bool /*fragile*/, bool /*free_spc*/) const { Paragraph * par = inset.paragraph(); @@ -374,13 +378,13 @@ int InsetERT::latex(Buffer const *, std::ostream & os, bool /*fragile*/, int InsetERT::ascii(Buffer const *, - std::ostream &, int /*linelen*/) const + ostream &, int /*linelen*/) const { return 0; } -int InsetERT::linuxdoc(Buffer const *, std::ostream & os) const +int InsetERT::linuxdoc(Buffer const *, ostream & os) const { Paragraph * par = inset.paragraph(); int lines = 0; @@ -409,7 +413,7 @@ int InsetERT::linuxdoc(Buffer const *, std::ostream & os) const } -int InsetERT::docbook(Buffer const *, std::ostream & os) const +int InsetERT::docbook(Buffer const *, ostream & os) const { Paragraph * par = inset.paragraph(); int lines = 0; @@ -447,14 +451,14 @@ InsetERT::localDispatch(BufferView * bv, kb_action action, string const & arg) set_latex_font(bv); } - switch(action) { + switch (action) { case LFUN_LAYOUT: bv->owner()->setLayout(inset.paragraph()->getLayout()); break; default: result = InsetCollapsable::localDispatch(bv, action, arg); } - switch(action) { + switch (action) { case LFUN_BREAKPARAGRAPH: case LFUN_BREAKPARAGRAPHKEEPLAYOUT: case LFUN_BACKSPACE: @@ -478,7 +482,7 @@ string const InsetERT::get_new_label() const string la; pos_type const max_length = 15; pos_type const p_siz = inset.paragraph()->size(); - pos_type const n = std::min(max_length, p_siz); + pos_type const n = min(max_length, p_siz); int i = 0; int j = 0; for(; i < n && j < p_siz; ++j) { @@ -617,7 +621,7 @@ void InsetERT::status(BufferView * bv, ERTStatus const st) const { if (st != status_) { status_ = st; - switch(st) { + switch (st) { case Inlined: inset.setAutoBreakRows(false); break; diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C index 0349abad2b..c358447417 100644 --- a/src/insets/insetexternal.C +++ b/src/insets/insetexternal.C @@ -14,27 +14,32 @@ #pragma implementation #endif -#include -#include - #include "insetexternal.h" #include "ExternalTemplate.h" #include "BufferView.h" #include "buffer.h" #include "LyXView.h" -#include "frontends/Dialogs.h" #include "lyx_main.h" #include "LaTeXFeatures.h" +#include "gettext.h" +#include "debug.h" + +#include "frontends/Dialogs.h" + #include "support/filetools.h" #include "support/lstrings.h" #include "support/path.h" #include "support/syscall.h" -#include "gettext.h" -#include "debug.h" #include "support/FileInfo.h" +#include +#include + + +using std::ostream; using std::endl; + InsetExternal::InsetExternal() : view_(0) { @@ -85,10 +90,10 @@ void InsetExternal::edit(BufferView * bv, bool) } -void InsetExternal::write(Buffer const *, std::ostream & os) const +void InsetExternal::write(Buffer const *, ostream & os) const { - os << "External " << params_.templ.lyxName << ",\"" << params_.filename - << "\",\"" << params_.parameters << "\"\n"; + os << "External " << params_.templ.lyxName << ",\"" + << params_.filename << "\",\"" << params_.parameters << "\"\n"; } @@ -129,15 +134,15 @@ void InsetExternal::read(Buffer const *, LyXLex & lex) int InsetExternal::write(string const & format, - Buffer const * buf, std::ostream & os) const + Buffer const * buf, ostream & os) const { ExternalTemplate const & et = params_.templ; ExternalTemplate::Formats::const_iterator cit = et.formats.find(format); if (cit == et.formats.end()) { lyxerr << "External template format '" << format - << "' not specified in template " << params_.templ.lyxName - << endl; + << "' not specified in template " + << params_.templ.lyxName << endl; return 0; } @@ -148,25 +153,25 @@ int InsetExternal::write(string const & format, int InsetExternal::latex(Buffer const * buf, - std::ostream & os, bool, bool) const + ostream & os, bool, bool) const { return write("LaTeX", buf, os); } -int InsetExternal::ascii(Buffer const * buf, std::ostream & os, int) const +int InsetExternal::ascii(Buffer const * buf, ostream & os, int) const { return write("Ascii", buf, os); } -int InsetExternal::linuxdoc(Buffer const * buf, std::ostream & os) const +int InsetExternal::linuxdoc(Buffer const * buf, ostream & os) const { return write("LinuxDoc", buf, os); } -int InsetExternal::docbook(Buffer const * buf, std::ostream & os) const +int InsetExternal::docbook(Buffer const * buf, ostream & os) const { return write("DocBook", buf, os); } @@ -225,7 +230,7 @@ void InsetExternal::executeCommand(string const & s, string const InsetExternal::doSubstitution(Buffer const * buffer, - string const & s) const + string const & s) const { string result; string const basename = ChangeExtension(params_.filename, string()); diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C index b51064490b..8d2c565f09 100644 --- a/src/insets/insetfloatlist.C +++ b/src/insets/insetfloatlist.C @@ -13,8 +13,11 @@ #include "gettext.h" #include "debug.h" + +using std::ostream; using std::endl; + InsetFloatList::InsetFloatList() : InsetCommand(InsetCommandParams()) { @@ -45,7 +48,7 @@ Inset::Code InsetFloatList::lyxCode() const } -void InsetFloatList::write(Buffer const *, std::ostream & os) const +void InsetFloatList::write(Buffer const *, ostream & os) const { os << "FloatList " << getCmdName() << "\n"; } @@ -85,7 +88,7 @@ void InsetFloatList::edit(BufferView * bv, bool) } -int InsetFloatList::latex(Buffer const *, std::ostream & os, bool, bool) const +int InsetFloatList::latex(Buffer const *, ostream & os, bool, bool) const { FloatList::const_iterator cit = floatList[getCmdName()]; @@ -112,7 +115,7 @@ int InsetFloatList::latex(Buffer const *, std::ostream & os, bool, bool) const } -int InsetFloatList::ascii(Buffer const * buffer, std::ostream & os, int) const +int InsetFloatList::ascii(Buffer const * buffer, ostream & os, int) const { os << getScreenLabel(buffer) << "\n\n"; diff --git a/src/insets/insetfoot.C b/src/insets/insetfoot.C index a9a103db49..a2297b6cd9 100644 --- a/src/insets/insetfoot.C +++ b/src/insets/insetfoot.C @@ -24,6 +24,9 @@ #include "debug.h" +using std::ostream; + + InsetFoot::InsetFoot() : InsetFootlike() { @@ -53,7 +56,7 @@ string const InsetFoot::editMessage() const int InsetFoot::latex(Buffer const * buf, - std::ostream & os, bool fragile, bool fp) const + ostream & os, bool fragile, bool fp) const { os << "%\n\\footnote{"; diff --git a/src/insets/insetfootlike.C b/src/insets/insetfootlike.C index edfd20dafb..fcbe711ba7 100644 --- a/src/insets/insetfootlike.C +++ b/src/insets/insetfootlike.C @@ -21,6 +21,9 @@ #include "support/LOstream.h" +using std::ostream; + + InsetFootlike::InsetFootlike() : InsetCollapsable() { @@ -43,7 +46,7 @@ InsetFootlike::InsetFootlike(InsetFootlike const & in, bool same_id) } -void InsetFootlike::write(Buffer const * buf, std::ostream & os) const +void InsetFootlike::write(Buffer const * buf, ostream & os) const { os << getInsetName() << "\n"; InsetCollapsable::write(buf, os); diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index 1373eedb33..e670ddda5e 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -91,39 +91,44 @@ TODO Before initial production release: #include "insets/insetgraphics.h" #include "insets/insetgraphicsParams.h" + #include "graphics/GraphicsCache.h" #include "graphics/GraphicsCacheItem.h" -#include "frontends/Dialogs.h" -#include "frontends/Alert.h" #include "LyXView.h" #include "buffer.h" #include "BufferView.h" #include "converter.h" -#include "frontends/support/LyXImage.h" #include "Painter.h" #include "lyx_gui_misc.h" -#include "support/FileInfo.h" -#include "support/filetools.h" -#include "support/lyxalgo.h" // lyx::count -#include "support/lyxlib.h" -#include "frontends/controllers/helper_funcs.h" #include "lyxtext.h" #include "lyxrc.h" -#include "font.h" // For the lyxfont class. -#include "fstream" // for ifstream in isEPS -#include // For the std::max -#include "support/lyxmanip.h" +#include "font.h" #include "debug.h" #include "gettext.h" -//#include "LOStream.h" + +#include "frontends/Dialogs.h" +#include "frontends/Alert.h" +#include "frontends/controllers/helper_funcs.h" +#include "frontends/support/LyXImage.h" + +#include "support/FileInfo.h" +#include "support/filetools.h" +#include "support/lyxlib.h" +#include "support/lyxmanip.h" #include "support/lyxalgo.h" +#include +#include + extern string system_tempdir; using std::ifstream; using std::ostream; using std::endl; +using std::max; +using std::vector; + /////////////////////////////////////////////////////////////////////////// int const VersionNumber = 1; @@ -230,10 +235,10 @@ int InsetGraphics::width(BufferView *, LyXFont const & font) const if (!msg.empty()) { msgFont.setSize(LyXFont::SIZE_TINY); int const msg_width = lyxfont::width(msg, msgFont); - font_width = std::max(font_width, msg_width); + font_width = max(font_width, msg_width); } - return std::max(50, font_width + 15); + return max(50, font_width + 15); } } @@ -342,7 +347,7 @@ void InsetGraphics::readInsetGraphics(Buffer const * buf, LyXLex & lex) string const token = lex.getString(); lyxerr[Debug::INFO] << "Token: '" << token << '\'' - << std::endl; + << endl; if (token.empty()) { continue; @@ -356,13 +361,13 @@ void InsetGraphics::readInsetGraphics(Buffer const * buf, LyXLex & lex) << "This document was created with a newer Graphics widget" ", You should use a newer version of LyX to read this" " file." - << std::endl; + << endl; // TODO: Possibly open up a dialog? } else { if (! params.Read(buf, lex, token)) lyxerr << "Unknown token, " << token << ", skipping." - << std::endl; + << endl; } } } @@ -370,7 +375,7 @@ void InsetGraphics::readInsetGraphics(Buffer const * buf, LyXLex & lex) // FormatVersion < 1.0 (LyX < 1.2) void InsetGraphics::readFigInset(Buffer const * buf, LyXLex & lex) { - std::vector const oldUnits = + vector const oldUnits = getVectorFromString("pt,cm,in,p%,c%"); bool finished = false; // set the display default diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C index 94aa851d5b..405368d2ff 100644 --- a/src/insets/insetgraphicsParams.C +++ b/src/insets/insetgraphicsParams.C @@ -17,12 +17,17 @@ #endif #include "insetgraphicsParams.h" + #include "support/translator.h" #include "support/filetools.h" #include "support/lyxlib.h" #include "support/LOstream.h" #include "support/LAssert.h" + +using std::ostream; + + namespace { /// This variable keeps a tab on whether the translator was set with the @@ -164,7 +169,7 @@ bool operator==(InsetGraphicsParams const & left, left.rotateOrigin == right.rotateOrigin && lyx::float_equal(left.rotateAngle, right.rotateAngle, 0.001 && left.special == right.special) - ) + ) return true; return false; diff --git a/src/insets/insetgraphicsParams.h b/src/insets/insetgraphicsParams.h index c218d0ecb4..130e530646 100644 --- a/src/insets/insetgraphicsParams.h +++ b/src/insets/insetgraphicsParams.h @@ -22,8 +22,6 @@ #include "buffer.h" #include "lyxlex.h" -using std::ostream; - /// This struct holds all the parameters needed by insetGraphics. struct InsetGraphicsParams { @@ -90,7 +88,7 @@ struct InsetGraphicsParams /// InsetGraphicsParams & operator=(InsetGraphicsParams const &); /// Save the parameters in the LyX format stream. - void Write(Buffer const * buf, ostream & os) const; + void Write(Buffer const * buf, std::ostream & os) const; /// If the token belongs to our parameters, read it. bool Read(Buffer const * buf, LyXLex & lex, string const & token); diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C index 31609e076b..4631d94ce5 100644 --- a/src/insets/insetinclude.C +++ b/src/insets/insetinclude.C @@ -295,7 +295,7 @@ int InsetInclude::latex(Buffer const * buffer, ostream & os, } -int InsetInclude::ascii(Buffer const *, std::ostream & os, int) const +int InsetInclude::ascii(Buffer const *, ostream & os, int) const { if (isVerbatim()) os << GetFileContents(getFileName()); diff --git a/src/insets/insetindex.C b/src/insets/insetindex.C index 02498e2be3..486aeb2311 100644 --- a/src/insets/insetindex.C +++ b/src/insets/insetindex.C @@ -27,7 +27,7 @@ string const InsetIndex::getScreenLabel(Buffer const *) const void InsetIndex::edit(BufferView * bv, int, int, unsigned int) { - bv->owner()->getDialogs()->showIndex( this ); + bv->owner()->getDialogs()->showIndex(this); } diff --git a/src/insets/insetlatexaccent.C b/src/insets/insetlatexaccent.C index 5321f006ec..a7cc82eb0a 100644 --- a/src/insets/insetlatexaccent.C +++ b/src/insets/insetlatexaccent.C @@ -548,7 +548,7 @@ void InsetLatexAccent::draw(BufferView * bv, LyXFont const & font0, case UMLAUT: // umlaut { pain.text(int(x2 - (lyxfont::rbearing('¨', font) - lyxfont::lbearing('¨', font)) / 2), - baseline - lyxfont::ascent(ic, font) - lyxfont::descent('¨', font) - ( lyxfont::ascent('¨', font) + lyxfont::descent('¨', font)) / 2, + baseline - lyxfont::ascent(ic, font) - lyxfont::descent('¨', font) - (lyxfont::ascent('¨', font) + lyxfont::descent('¨', font)) / 2, '¨', font); break; } diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C index 201c333a7c..1a0eb1b5be 100644 --- a/src/insets/insetmarginal.C +++ b/src/insets/insetmarginal.C @@ -24,6 +24,9 @@ #include "debug.h" +using std::ostream; + + InsetMarginal::InsetMarginal() : InsetFootlike() { @@ -53,7 +56,7 @@ string const InsetMarginal::editMessage() const int InsetMarginal::latex(Buffer const * buf, - std::ostream & os, bool fragile, bool fp) const + ostream & os, bool fragile, bool fp) const { os << "%\n\\marginpar{"; diff --git a/src/insets/insetref.C b/src/insets/insetref.C index b35e77e7c7..b6fccf4831 100644 --- a/src/insets/insetref.C +++ b/src/insets/insetref.C @@ -25,11 +25,11 @@ InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf, bool) void InsetRef::edit(BufferView * bv, int, int, unsigned int button) { // Eventually trigger dialog with button 3 not 1 - if (button == 3 ) + if (button == 3) bv->owner()->getLyXFunc()-> dispatch(LFUN_REF_GOTO, getContents()); - else if (button == 1 ) - bv->owner()->getDialogs()->showRef( this ); + else if (button == 1) + bv->owner()->getDialogs()->showRef(this); } @@ -63,7 +63,7 @@ int InsetRef::latex(Buffer const *, ostream & os, if (getOptions().empty()) os << escape(getCommand()); else { - InsetCommandParams p( getCmdName(), getContents(), "" ); + InsetCommandParams p(getCmdName(), getContents(), ""); os << escape(p.getCommand()); } return 0; diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index c504aa15ff..2c4163911b 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -48,6 +48,8 @@ #include //#include + +using std::vector; using std::ostream; using std::ifstream; using std::max; @@ -1112,7 +1114,7 @@ InsetTabular::localDispatch(BufferView * bv, kb_action action, while (p < len && ((p = clip.find_first_of("\t\n", p)) != string::npos)) { - switch(clip[p]) { + switch (clip[p]) { case '\t': ++cols; break; @@ -1136,7 +1138,7 @@ InsetTabular::localDispatch(BufferView * bv, kb_action action, (p = clip.find_first_of("\t\n", p)) != string::npos) { if (p >= len) break; - switch(clip[p]) { + switch (clip[p]) { case '\t': paste_tabular->GetCellInset(cell)->setText(clip.substr(op, p-op)); ++cols; @@ -2352,7 +2354,7 @@ FuncStatus InsetTabular::getStatus(string const & what) const } -std::vector const InsetTabular::getLabelList() const +vector const InsetTabular::getLabelList() const { return tabular->getLabelList(); } @@ -2468,7 +2470,7 @@ bool InsetTabular::cutSelection() } -bool InsetTabular::isRightToLeft(BufferView *bv ) +bool InsetTabular::isRightToLeft(BufferView * bv) { return bv->getParentLanguage(this)->RightToLeft(); } diff --git a/src/insets/insettext.C b/src/insets/insettext.C index 5c866725c6..8889f2869e 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -62,6 +62,7 @@ using std::min; using std::max; using std::make_pair; using std::vector; +using std::pair; using lyx::pos_type; using lyx::layout_type; @@ -1086,7 +1087,7 @@ InsetText::localDispatch(BufferView * bv, updateLocal(bv, CURSOR_PAR, false); return result; } else if (result >= FINISHED) { - switch(result) { + switch (result) { case FINISHED_RIGHT: moveRightIntern(bv, false, false); result = DISPATCHED; @@ -1320,7 +1321,7 @@ InsetText::localDispatch(BufferView * bv, // Derive layout number from given argument (string) // and current buffer's textclass (number). */ textclass_type tclass = bv->buffer()->params.textclass; - std::pair layout = + pair layout = textclasslist.NumberOfLayout(tclass, arg); // If the entry is obsolete, use the new one instead. @@ -1524,7 +1525,7 @@ int InsetText::docbook(Buffer const * buf, ostream & os) const } if (environment_stack[depth] != style.latexname()) { - if(environment_stack.size() == depth + 1) { + if (environment_stack.size() == depth + 1) { environment_stack.push_back("!-- --"); environment_inner.push_back("!-- --"); } @@ -1547,7 +1548,7 @@ int InsetText::docbook(Buffer const * buf, ostream & os) const if (style.latextype == LATEX_ENVIRONMENT) { if (!style.latexparam().empty()) { - if(style.latexparam() == "CDATA") + if (style.latexparam() == "CDATA") os << "sgmlOpenTag(os, depth + command_depth, @@ -1591,7 +1592,7 @@ int InsetText::docbook(Buffer const * buf, ostream & os) const switch (style.latextype) { case LATEX_ENVIRONMENT: if (!style.latexparam().empty()) { - if(style.latexparam() == "CDATA") + if (style.latexparam() == "CDATA") os << "]]>"; else buf->sgmlCloseTag(os, depth + command_depth, @@ -1882,16 +1883,16 @@ bool InsetText::showInsetDialog(BufferView * bv) const } -std::vector const InsetText::getLabelList() const +vector const InsetText::getLabelList() const { - std::vector label_list; + vector label_list; Paragraph * tpar = par; while (tpar) { Paragraph::inset_iterator beg = tpar->inset_iterator_begin(); Paragraph::inset_iterator end = tpar->inset_iterator_end(); for (; beg != end; ++beg) { - std::vector const l = (*beg)->getLabelList(); + vector const l = (*beg)->getLabelList(); label_list.insert(label_list.end(), l.begin(), l.end()); } tpar = tpar->next(); diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C index 5c52074cfa..c93c62e26a 100644 --- a/src/insets/insettoc.C +++ b/src/insets/insettoc.C @@ -12,7 +12,10 @@ #include "debug.h" #include "buffer.h" + using std::vector; +using std::ostream; + string const InsetTOC::getScreenLabel(Buffer const *) const { @@ -45,7 +48,7 @@ void InsetTOC::edit(BufferView * bv, bool) } -int InsetTOC::ascii(Buffer const * buffer, std::ostream & os, int) const +int InsetTOC::ascii(Buffer const * buffer, ostream & os, int) const { os << getScreenLabel(buffer) << "\n\n"; @@ -69,7 +72,7 @@ int InsetTOC::ascii(Buffer const * buffer, std::ostream & os, int) const } -int InsetTOC::linuxdoc(Buffer const *, std::ostream & os) const +int InsetTOC::linuxdoc(Buffer const *, ostream & os) const { if (getCmdName() == "tableofcontents") os << ""; @@ -77,7 +80,7 @@ int InsetTOC::linuxdoc(Buffer const *, std::ostream & os) const } -int InsetTOC::docbook(Buffer const *, std::ostream & os) const +int InsetTOC::docbook(Buffer const *, ostream & os) const { if (getCmdName() == "tableofcontents") os << ""; diff --git a/src/insets/inseturl.C b/src/insets/inseturl.C index 58bd309f5e..848584044f 100644 --- a/src/insets/inseturl.C +++ b/src/insets/inseturl.C @@ -23,7 +23,7 @@ InsetUrl::InsetUrl(InsetCommandParams const & p, bool) void InsetUrl::edit(BufferView * bv, int, int, unsigned int) { - bv->owner()->getDialogs()->showUrl( this ); + bv->owner()->getDialogs()->showUrl(this); } @@ -36,7 +36,7 @@ void InsetUrl::edit(BufferView * bv, bool) string const InsetUrl::getScreenLabel(Buffer const *) const { string temp; - if (getCmdName() == "url" ) + if (getCmdName() == "url") temp = _("Url: "); else temp = _("HtmlUrl: "); diff --git a/src/iterators.C b/src/iterators.C index 86c1218e85..6ae3a237e2 100644 --- a/src/iterators.C +++ b/src/iterators.C @@ -5,14 +5,14 @@ ParIterator & ParIterator::operator++() { while (!positions.empty()) { - ParPosition & p = positions.back(); + ParPosition & p = positions.top(); // Does the current inset contain more "cells" ? if (p.index >= 0) { ++p.index; Paragraph * par = (*p.it)->getFirstParagraph(p.index); if (par) { - positions.push_back(ParPosition(par)); + positions.push(ParPosition(par)); return *this; } ++p.it; @@ -23,11 +23,12 @@ ParIterator & ParIterator::operator++() p.it = p.par->inset_iterator_begin(); // Try to find the next inset that contains paragraphs - for ( ; p.it != p.par->inset_iterator_end(); ++p.it) { + Paragraph::inset_iterator end = p.par->inset_iterator_end(); + for (; p.it != end; ++p.it) { Paragraph * par = (*p.it)->getFirstParagraph(0); if (par) { p.index = 0; - positions.push_back(ParPosition(par)); + positions.push(ParPosition(par)); return *this; } } @@ -37,7 +38,7 @@ ParIterator & ParIterator::operator++() return *this; } - positions.pop_back(); + positions.pop(); } return *this; } diff --git a/src/iterators.h b/src/iterators.h index 712e3aed5c..f34e76917d 100644 --- a/src/iterators.h +++ b/src/iterators.h @@ -3,7 +3,7 @@ #ifndef ITERATORS_H #define ITERATORS_H -#include +#include #include "paragraph.h" @@ -35,24 +35,29 @@ bool operator!=(ParPosition const & pos1, ParPosition const & pos2) { class ParIterator { public: + /// + typedef std::stack PosHolder; /// ParIterator() {} - // - ParIterator(Paragraph * par) - : positions(1, ParPosition(par)) {} + /// + ParIterator(Paragraph * par) { + positions.push(ParPosition(par)); + } /// ParIterator & operator++(); /// - Paragraph * operator*() { return positions.back().par; } + Paragraph * operator*() { + return positions.top().par; + } /// - std::vector::size_type size() const + PosHolder::size_type size() const { return positions.size(); } /// friend bool operator==(ParIterator const & iter1, ParIterator const & iter2); private: /// - std::vector positions; + PosHolder positions; }; diff --git a/src/kbsequence.C b/src/kbsequence.C index db17594898..a56440dfdf 100644 --- a/src/kbsequence.C +++ b/src/kbsequence.C @@ -23,7 +23,12 @@ #include "commandtags.h" #include "debug.h" + +using std::vector; using std::endl; +using std::hex; +using std::dec; + // The only modifiers that we handle. We want to throw away things // like NumLock. @@ -137,7 +142,7 @@ string const kb_sequence::print() const if (deleted_) return buf; - for (std::vector::size_type i = 0; i < length_; ++i) { + for (vector::size_type i = 0; i < length_; ++i) { buf += kb_keymap::printKeysym(sequence[i], modifiers[i] & 0xffff); // append a blank @@ -182,9 +187,9 @@ char kb_sequence::getiso() const unsigned int const c = getsym(); lyxerr[Debug::KBMAP] << "Raw keysym: " - << std::hex << c << std::dec << endl; + << hex << c << dec << endl; lyxerr[Debug::KBMAP] << "byte 3: " - << std::hex << (c & 0xff00) << std::dec + << hex << (c & 0xff00) << dec << endl; return kb_keymap::getiso(c); } diff --git a/src/lastfiles.C b/src/lastfiles.C index a3b72d408f..477b13f8c6 100644 --- a/src/lastfiles.C +++ b/src/lastfiles.C @@ -24,8 +24,14 @@ #include #include + +using std::ifstream; +using std::ofstream; using std::getline; using std::endl; +using std::find; +using std::copy; +using std::ostream_iterator; LastFiles::LastFiles(string const & filename, bool st, unsigned int num) @@ -53,7 +59,7 @@ void LastFiles::readFile(string const & filename) { // we will not complain if we can't find filename nor will // we issue a warning. (Lgb) - std::ifstream ifs(filename.c_str()); + ifstream ifs(filename.c_str()); string tmp; FileInfo fileInfo; @@ -70,10 +76,10 @@ void LastFiles::readFile(string const & filename) void LastFiles::writeFile(string const & filename) const { - std::ofstream ofs(filename.c_str()); + ofstream ofs(filename.c_str()); if (ofs) { - std::copy(files.begin(), files.end(), - std::ostream_iterator(ofs, "\n")); + copy(files.begin(), files.end(), + ostream_iterator(ofs, "\n")); } else lyxerr << "LyX: Warning: unable to save LastFiles: " << filename << endl; @@ -83,7 +89,7 @@ void LastFiles::writeFile(string const & filename) const void LastFiles::newFile(string const & file) { // If file already exist, delete it and reinsert at front. - Files::iterator it = std::find(files.begin(), files.end(), file); + Files::iterator it = find(files.begin(), files.end(), file); if (it != files.end()) files.erase(it); files.push_front(file); diff --git a/src/lyx_cb.C b/src/lyx_cb.C index 2bbe4a3347..da4a2717d2 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -521,9 +521,9 @@ void MenuInsertLabel(BufferView * bv, string const & arg) } } if (!label.empty()) { - InsetCommandParams p( "label", label ); - InsetLabel * inset = new InsetLabel( p ); - bv->insertInset( inset ); + InsetCommandParams p("label", label); + InsetLabel * inset = new InsetLabel(p); + bv->insertInset(inset); } bv->owner()->allowInput(); } diff --git a/src/lyx_gui.C b/src/lyx_gui.C index 50ebac4742..552819fdd7 100644 --- a/src/lyx_gui.C +++ b/src/lyx_gui.C @@ -115,7 +115,7 @@ LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI) fl_get_app_resources(res, num_res); static const int geometryBitmask = - XParseGeometry( geometry, + XParseGeometry(geometry, &xpos, &ypos, reinterpret_cast(&width), @@ -302,7 +302,7 @@ void LyXGUI::create_forms() // This is probably as good a time as any to map the xform colours, // should a mapping exist. string const filename = AddName(user_lyxdir, "preferences.xform"); - XformsColor::read( filename ); + XformsColor::read(filename); // Show the main & title form int main_placement = FL_PLACE_CENTER | FL_FREE_SIZE; diff --git a/src/lyx_main.C b/src/lyx_main.C index 3b6e3a7ba6..46143a7020 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -667,7 +667,7 @@ bool LyX::readRcFile(string const & name) lyxerr[Debug::INIT] << "About to read " << name << "..." << endl; string const lyxrc_path = LibFileSearch(string(), name); - if (!lyxrc_path.empty()){ + if (!lyxrc_path.empty()) { lyxerr[Debug::INIT] << "Found " << name << " in " << lyxrc_path << endl; if (lyxrc.read(lyxrc_path) < 0) { @@ -732,7 +732,7 @@ void LyX::readUIFile(string const & name) break; default: - if(!strip(lex.getString()).empty()) + if (!strip(lex.getString()).empty()) lex.printError("LyX::ReadUIFile: " "Unknown menu tag: `$$Token'"); break; diff --git a/src/lyxfont.h b/src/lyxfont.h index 5d75c20f2e..28611e5429 100644 --- a/src/lyxfont.h +++ b/src/lyxfont.h @@ -419,7 +419,7 @@ LyXFont::FONT_MISC_STATE LyXFont::noun() const inline bool LyXFont::isSymbolFont() const { - switch(family()) { + switch (family()) { case LyXFont::SYMBOL_FAMILY: case LyXFont::CMSY_FAMILY: case LyXFont::CMM_FAMILY: diff --git a/src/lyxfunc.C b/src/lyxfunc.C index b626117250..3691d747cd 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -106,6 +106,9 @@ using std::pair; using std::make_pair; using std::endl; using std::find_if; +using std::vector; +using std::transform; +using std::back_inserter; extern BufferList bufferlist; extern LyXServer * lyxserver; @@ -880,7 +883,7 @@ string const LyXFunc::dispatch(kb_action action, string argument) (!keyseq.deleted()))) { if ((action == LFUN_UNKNOWN_ACTION) - && argument.empty()){ + && argument.empty()) { argument = keyseq.getiso(); } // Undo/Redo is a bit tricky for insets. @@ -1024,10 +1027,10 @@ string const LyXFunc::dispatch(kb_action action, string argument) // --- Misc ------------------------------------------- case LFUN_EXEC_COMMAND: { - std::vector allCmds; - std::transform(lyxaction.func_begin(), lyxaction.func_end(), - std::back_inserter(allCmds), lyx::firster()); - static std::vector hist; + vector allCmds; + transform(lyxaction.func_begin(), lyxaction.func_end(), + back_inserter(allCmds), lyx::firster()); + static vector hist; owner->getMiniBuffer()->getString(MiniBuffer::spaces, allCmds, hist); } @@ -1143,7 +1146,7 @@ string const LyXFunc::dispatch(kb_action action, string argument) #endif p.setCmdName("tableofcontents"); #if 0 - else if (action == LFUN_LOAVIEW ) + else if (action == LFUN_LOAVIEW) p.setCmdName("listof{algorithm}{List of Algorithms}"); else if (action == LFUN_LOFVIEW) p.setCmdName("listoffigures"); @@ -1412,7 +1415,7 @@ string const LyXFunc::dispatch(kb_action action, string argument) Paragraph * par = owner->buffer()->getParFromID(id); if (par == 0) { lyxerr[Debug::INFO] << "No matching paragraph found! [" - << id << "]" << std::endl; + << id << "]" << endl; break; } else { lyxerr << "Paragraph " << par->id() @@ -1498,7 +1501,7 @@ string const LyXFunc::dispatch(kb_action action, string argument) case LFUN_CITATION_CREATE: { - InsetCommandParams p( "cite" ); + InsetCommandParams p("cite"); if (!argument.empty()) { // This should be set at source, ie when typing @@ -1506,14 +1509,14 @@ string const LyXFunc::dispatch(kb_action action, string argument) // Question: would pybibliographer also need to be // changed. Suspect so. Leave as-is therefore. if (contains(argument, "|")) { - p.setContents( token(argument, '|', 0) ); - p.setOptions( token(argument, '|', 1) ); + p.setContents(token(argument, '|', 0)); + p.setOptions( token(argument, '|', 1)); } else { - p.setContents( argument ); + p.setContents(argument); } dispatch(LFUN_CITATION_INSERT, p.getAsString()); } else - owner->getDialogs()->createCitation( p.getAsString() ); + owner->getDialogs()->createCitation(p.getAsString()); } break; diff --git a/src/lyxlength.C b/src/lyxlength.C index 1ae1de2098..7eb622220c 100644 --- a/src/lyxlength.C +++ b/src/lyxlength.C @@ -57,7 +57,7 @@ string const LyXLength::asString() const string const LyXLength::asLatexString() const { ostringstream buffer; - switch(unit_) { + switch (unit_) { case PW: buffer << abs(static_cast(val_/100)) << "." << abs(static_cast(val_)%100) << "\\textwidth"; diff --git a/src/lyxlex.C b/src/lyxlex.C index c44d5e0fe1..86ec37b86b 100644 --- a/src/lyxlex.C +++ b/src/lyxlex.C @@ -63,7 +63,7 @@ string const LyXLex::text() const } -std::istream & LyXLex::getStream() +istream & LyXLex::getStream() { return pimpl_->is; } diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C index 1dc807724e..fd4cb586a7 100644 --- a/src/lyxlex_pimpl.C +++ b/src/lyxlex_pimpl.C @@ -222,7 +222,7 @@ bool LyXLex::Pimpl::next(bool esc /* = false */) is.get(cc); c = cc; } while (c > ' ' && c != ',' && is - && (i != LEX_MAX_BUFF - 1) ); + && (i != LEX_MAX_BUFF - 1)); if (i == LEX_MAX_BUFF - 1) { printError("Line too long"); } @@ -273,7 +273,7 @@ bool LyXLex::Pimpl::next(bool esc /* = false */) is.get(cc); c = cc; } while (c > ' ' && c != ',' && is - && (i != LEX_MAX_BUFF - 1) ); + && (i != LEX_MAX_BUFF - 1)); if (i == LEX_MAX_BUFF - 1) { printError("Line too long"); } @@ -352,7 +352,7 @@ bool LyXLex::Pimpl::next(bool esc /* = false */) is.get(cc); c = cc; } while (c > ' ' && c != ',' && is - && (i != LEX_MAX_BUFF-1) ); + && (i != LEX_MAX_BUFF-1)); if (i == LEX_MAX_BUFF-1) { printError("Line too long"); } diff --git a/src/lyxlookup.C b/src/lyxlookup.C index 39916ed893..9fc627f957 100644 --- a/src/lyxlookup.C +++ b/src/lyxlookup.C @@ -259,7 +259,7 @@ void CloseLyXLookup() XComposeStatus compose_status= {0, 0}; // This is called after the main LyX window has been created -void InitLyXLookup(Display *, Window ) +void InitLyXLookup(Display *, Window) { //Nothing to do. } diff --git a/src/lyxrc.C b/src/lyxrc.C index b0dc77ff74..79f7f72eb8 100644 --- a/src/lyxrc.C +++ b/src/lyxrc.C @@ -1246,7 +1246,7 @@ void LyXRC::output(ostream & os) const << "#\n\n"; case RC_SET_COLOR: - for (int i = 0; i < LColor::ignore; ++i ) { + for (int i = 0; i < LColor::ignore; ++i) { LColor::color lc = static_cast(i); string const col(lcolor.getX11Name(lc)); diff --git a/src/lyxserver.C b/src/lyxserver.C index ba3e085671..69fa710eea 100644 --- a/src/lyxserver.C +++ b/src/lyxserver.C @@ -251,7 +251,7 @@ void LyXComm::endPipe(int & fd, string const & filename) // OS/2 pipes are deleted automatically #ifndef __EMX__ - if (lyx::unlink(filename) < 0){ + if (lyx::unlink(filename) < 0) { lyxerr << "LyXComm: Could not remove pipe " << filename << '\n' << strerror(errno) << endl; }; @@ -318,7 +318,7 @@ void LyXComm::callback(int fd, void *v) errno = 0; return; // up to libforms select-loop (*crunch*) } - if (errno != 0 ) + if (errno != 0) { lyxerr << "LyXComm: " << strerror(errno) << endl; if (!lsbuf.empty()) @@ -450,7 +450,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg) // we are listening. if (cmd == "hello") { // One more client - if (serv->numclients == MAX_CLIENTS){ //paranoid check + if (serv->numclients == MAX_CLIENTS) { //paranoid check lyxerr[Debug::LYXSERVER] << "LyXServer: too many clients..." << endl; diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C index b2ee820c70..110f2c7d89 100644 --- a/src/lyxtextclass.C +++ b/src/lyxtextclass.C @@ -29,6 +29,7 @@ using std::endl; using std::find_if; using std::remove_if; +using std::ostream; /* ******************************************************************* */ @@ -530,7 +531,7 @@ void LyXTextClass::load() } -std::ostream & operator<<(std::ostream & os, LyXTextClass::PageSides p) +ostream & operator<<(ostream & os, LyXTextClass::PageSides p) { switch (p) { case LyXTextClass::OneSide: diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am index d1491f253c..c72aaedc3a 100644 --- a/src/mathed/Makefile.am +++ b/src/mathed/Makefile.am @@ -1,13 +1,13 @@ AUTOMAKE_OPTIONS = foreign 1.4 DISTCLEANFILES= *.orig *.rej *~ *.bak core MAINTAINERCLEANFILES = $(srcdir)/Makefile.in -noinst_LTLIBRARIES = libmathed.la +noinst_LTLIBRARIES = libmathed.o LIBS= ETAGS_ARGS = --lang=c++ BOOST_INCLUDES = -I$(top_srcdir)/boost INCLUDES = -I${srcdir}/../ $(SIGC_CFLAGS) $(BOOST_INCLUDES) -libmathed_la_SOURCES = \ +libmathed_o_SOURCES = \ formulabase.C \ formulabase.h \ formula.C \ diff --git a/src/mathed/formula.C b/src/mathed/formula.C index 19b36006ff..121bef4c55 100644 --- a/src/mathed/formula.C +++ b/src/mathed/formula.C @@ -324,7 +324,7 @@ void InsetFormula::read(Buffer const *, LyXLex & lex) } -//std::ostream & operator<<(std::ostream & os, LyXCursor const & c) +//ostream & operator<<(ostream & os, LyXCursor const & c) //{ // os << '[' << c.x() << ' ' << c.y() << ' ' << c.pos() << ']'; // return os; diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C index f1c6113b57..1f28e67f30 100644 --- a/src/mathed/formulabase.C +++ b/src/mathed/formulabase.C @@ -265,7 +265,7 @@ void InsetFormulaBase::toggleInsetSelection(BufferView * bv) vector const InsetFormulaBase::getLabelList() const { - return std::vector(); + return vector(); } @@ -739,7 +739,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, } -void InsetFormulaBase::revealCodes(BufferView * bv) const +void InsetFormulaBase::revealCodes(BufferView * /*bv*/) const { if (!mathcursor) return; diff --git a/src/mathed/math_arrayinset.C b/src/mathed/math_arrayinset.C index d0cd009438..e19bf8b25e 100644 --- a/src/mathed/math_arrayinset.C +++ b/src/mathed/math_arrayinset.C @@ -15,6 +15,7 @@ using std::vector; using std::istringstream; using std::getline; +using std::istream_iterator; MathArrayInset::MathArrayInset(string const & name, int m, int n) @@ -43,7 +44,7 @@ MathArrayInset::MathArrayInset(string const & name, string const & str) string line; getline(is, line); istringstream ls(line.c_str()); - typedef std::istream_iterator iter; + typedef istream_iterator iter; vector v = vector(iter(ls), iter()); if (v.size()) dat.push_back(v); diff --git a/src/mathed/math_atom.C b/src/mathed/math_atom.C index 068a2943aa..0e70a9b043 100644 --- a/src/mathed/math_atom.C +++ b/src/mathed/math_atom.C @@ -24,6 +24,10 @@ #include + +using std::swap; + + MathAtom::MathAtom() : nucleus_(0) {} @@ -44,7 +48,7 @@ void MathAtom::operator=(MathAtom const & p) if (&p == this) return; MathAtom tmp(p); - std::swap(tmp.nucleus_, nucleus_); + swap(tmp.nucleus_, nucleus_); } diff --git a/src/mathed/math_binaryopinset.C b/src/mathed/math_binaryopinset.C index 40fc662fbb..bd1300e07e 100644 --- a/src/mathed/math_binaryopinset.C +++ b/src/mathed/math_binaryopinset.C @@ -11,6 +11,9 @@ #include "math_mathmlstream.h" +using std::max; + + MathBinaryOpInset::MathBinaryOpInset(char op) : MathNestInset(2), op_(op) {} @@ -34,8 +37,8 @@ void MathBinaryOpInset::metrics(MathMetricsInfo const & mi) const xcell(0).metrics(mi); xcell(1).metrics(mi); width_ = xcell(0).width() + xcell(1).width() + opwidth(); - ascent_ = std::max(xcell(0).ascent(), xcell(1).ascent()); - descent_ = std::max(xcell(0).descent(), xcell(1).descent()); + ascent_ = max(xcell(0).ascent(), xcell(1).ascent()); + descent_ = max(xcell(0).descent(), xcell(1).descent()); } diff --git a/src/mathed/math_binominset.C b/src/mathed/math_binominset.C index 35d1e7dbc9..f7aa2693db 100644 --- a/src/mathed/math_binominset.C +++ b/src/mathed/math_binominset.C @@ -10,6 +10,9 @@ #include "math_mathmlstream.h" +using std::max; + + MathBinomInset::MathBinomInset() {} @@ -39,7 +42,7 @@ void MathBinomInset::metrics(MathMetricsInfo const & st) const xcell(1).metrics(mi); ascent_ = xcell(0).height() + 4 + 5; descent_ = xcell(1).height() + 4 - 5; - width_ = std::max(xcell(0).width(), xcell(1).width()) + 2 * dw() + 4; + width_ = max(xcell(0).width(), xcell(1).width()) + 2 * dw() + 4; } diff --git a/src/mathed/math_braceinset.C b/src/mathed/math_braceinset.C index 65970370c4..39994391aa 100644 --- a/src/mathed/math_braceinset.C +++ b/src/mathed/math_braceinset.C @@ -10,6 +10,9 @@ #include "math_mathmlstream.h" +using std::max; + + MathBraceInset::MathBraceInset() : MathNestInset(1) {} @@ -26,8 +29,8 @@ void MathBraceInset::metrics(MathMetricsInfo const & mi) const xcell(0).metrics(mi); int a, d; mathed_char_dim(LM_TC_TEX, mi, '{', a, d, wid_); - ascent_ = std::max(xcell(0).ascent(), a); - descent_ = std::max(xcell(0).descent(), a); + ascent_ = max(xcell(0).ascent(), a); + descent_ = max(xcell(0).descent(), a); width_ = xcell(0).width() + 2 * wid_; } diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C index e0ba2e9e81..bbc9bbcd13 100644 --- a/src/mathed/math_charinset.C +++ b/src/mathed/math_charinset.C @@ -17,6 +17,9 @@ #include "LaTeXFeatures.h" +using std::ostream; + + MathCharInset::MathCharInset(char c) : char_(c), code_(nativeCode(c)) { @@ -60,21 +63,21 @@ void MathCharInset::draw(Painter & pain, int x, int y) const } -void MathCharInset::writeHeader(std::ostream & os) const +void MathCharInset::writeHeader(ostream & os) const { if (math_font_name(code_)) os << '\\' << math_font_name(code_) << '{'; } -void MathCharInset::writeTrailer(std::ostream & os) const +void MathCharInset::writeTrailer(ostream & os) const { if (math_font_name(code_)) os << '}'; } -void MathCharInset::writeRaw(std::ostream & os) const +void MathCharInset::writeRaw(ostream & os) const { os << char_; } @@ -110,7 +113,7 @@ void MathCharInset::validate(LaTeXFeatures & features) const { // Make sure amssymb is put in preamble if Blackboard Bold or // Fraktur used: - if ( (code_ == LM_TC_BB) || (code_ == LM_TC_EUFRAK) ) + if ((code_ == LM_TC_BB) || (code_ == LM_TC_EUFRAK)) features.require("amssymb"); } diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C index a3581aff1a..2698c5bed3 100644 --- a/src/mathed/math_cursor.C +++ b/src/mathed/math_cursor.C @@ -56,6 +56,8 @@ using std::min; using std::max; using std::swap; using std::isalnum; +using std::vector; +using std::ostringstream; namespace { @@ -76,11 +78,11 @@ struct Selection c1 = p->col(i1.idx_); c2 = p->col(i2.idx_); if (c1 > c2) - std::swap(c1, c2); + swap(c1, c2); r1 = p->row(i1.idx_); r2 = p->row(i2.idx_); if (r1 > r2) - std::swap(r1, r2); + swap(r1, r2); } void grab(MathCursor const & cursor) @@ -659,7 +661,7 @@ string MathCursor::macroName() const { string s; MathInset::difference_type i = macroNamePos(); - for ( ; i >= 0 && i < int(pos()); ++i) + for (; i >= 0 && i < int(pos()); ++i) s += array().at(i)->getChar(); return s; } @@ -766,7 +768,7 @@ void MathCursor::drawSelection(Painter & pain) const int y2 = c.yo() + c.descent(); pain.fillRectangle(x1, y1, x2 - x1, y2 - y1, LColor::selection); } else { - std::vector indices + vector indices = i1.par_->idxBetween(i1.idx_, i2.idx_); for (unsigned i = 0; i < indices.size(); ++i) { MathXArray & c = i1.xcell(indices[i]); @@ -938,7 +940,7 @@ void MathCursor::normalize() { MathIterator it = ibegin(formula()->par().nucleus()); MathIterator et = iend(formula()->par().nucleus()); - for ( ; it != et; ++it) + for (; it != et; ++it) if (it.par()->asBoxInset()) it.par()->asBoxInset()->rebreak(); } @@ -1264,7 +1266,7 @@ bool MathCursor::interpret(string const & s) unsigned int n = 1; istringstream is(s.substr(5).c_str()); is >> n; - n = std::max(1u, n); + n = max(1u, n); niceInsert(MathAtom(new MathCasesInset(n))); return true; } @@ -1276,8 +1278,8 @@ bool MathCursor::interpret(string const & s) string h_align; istringstream is(s.substr(6).c_str()); is >> m >> n >> v_align >> h_align; - m = std::max(1u, m); - n = std::max(1u, n); + m = max(1u, m); + n = max(1u, n); v_align += 'c'; niceInsert(MathAtom(new MathArrayInset("array", m, n, v_align[0], h_align))); return true; @@ -1521,7 +1523,7 @@ void MathCursor::setSelection(cursor_type const & where, size_type n) string MathCursor::info() const { - std::ostringstream os; + ostringstream os; if (pos() > 0) prevAtom()->infoize(os); return os.str(); diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C index b4cd2bc507..ad5697e3a3 100644 --- a/src/mathed/math_deliminset.C +++ b/src/mathed/math_deliminset.C @@ -12,6 +12,9 @@ #include "math_extern.h" +using std::max; + + MathDelimInset::MathDelimInset(string const & l, string const & r) : MathNestInset(1), left_(l), right_(r) {} @@ -54,10 +57,10 @@ void MathDelimInset::metrics(MathMetricsInfo const & mi) const int a, d, w; mathed_char_dim(LM_TC_VAR, mi, 'I', a, d, w); int h0 = (a + d) / 2; - int a0 = std::max(xcell(0).ascent(), a) - h0; - int d0 = std::max(xcell(0).descent(), d) + h0; - ascent_ = std::max(a0, d0) + h0; - descent_ = std::max(a0, d0) - h0; + int a0 = max(xcell(0).ascent(), a) - h0; + int d0 = max(xcell(0).descent(), d) + h0; + ascent_ = max(a0, d0) + h0; + descent_ = max(a0, d0) - h0; width_ = xcell(0).width() + 2 * dw() + 8; } diff --git a/src/mathed/math_extern.C b/src/mathed/math_extern.C index c317f3fe57..1681338fc1 100644 --- a/src/mathed/math_extern.C +++ b/src/mathed/math_extern.C @@ -21,7 +21,12 @@ #include "debug.h" -std::ostream & operator<<(std::ostream & os, MathArray const & ar) +using std::ostream; +using std::istringstream; +using std::find_if; + + +ostream & operator<<(ostream & os, MathArray const & ar) { NormalStream ns(os); ns << ar; @@ -194,7 +199,7 @@ bool extractNumber(MathArray const & ar, int & i) string s; MathTextCodes c; charSequence(ar.begin(), ar.end(), s, c); - std::istringstream is(s.c_str()); + istringstream is(s.c_str()); is >> i; return is; } @@ -547,7 +552,7 @@ void extractSums(MathArray & ar) // try to figure out the summation index from the subscript MathArray & ar = sub->down().data_; MathArray::iterator it = - std::find_if(ar.begin(), ar.end(), &testEqualSign); + find_if(ar.begin(), ar.end(), &testEqualSign); if (it != ar.end()) { // we found a '=', use everything in front of that as index, // and everything behind as lower index @@ -612,7 +617,7 @@ bool extractDiffExponent(MathArray::iterator it, int & i) string s; if (!extractString((*it).nucleus(), s)) return false; - std::istringstream is(s.c_str()); + istringstream is(s.c_str()); is >> i; return is; } @@ -659,9 +664,9 @@ void extractDiff(MathArray & ar) // collect denominator parts MathArray & denom = f->cell(1); - for (MathArray::iterator dt = denom.begin(); dt != denom.end(); ) { + for (MathArray::iterator dt = denom.begin(); dt != denom.end();) { // find the next 'd' - MathArray::iterator et = std::find_if(dt + 1, denom.end(), &testDiffItem); + MathArray::iterator et = find_if(dt + 1, denom.end(), &testDiffItem); // point before this MathArray::iterator st = et - 1; @@ -670,7 +675,7 @@ void extractDiff(MathArray & ar) // things like d.../dx^n int mult = 1; if (extractNumber(script->up().data_, mult)) { - //lyxerr << "mult: " << mult << std::endl; + //lyxerr << "mult: " << mult << endl; for (int i = 0; i < mult; ++i) diff->addDer(MathArray(dt + 1, st)); } diff --git a/src/mathed/math_fracinset.C b/src/mathed/math_fracinset.C index 5b560c88a3..01e7b80286 100644 --- a/src/mathed/math_fracinset.C +++ b/src/mathed/math_fracinset.C @@ -8,6 +8,9 @@ #include "math_mathmlstream.h" +using std::max; + + MathFracInset::MathFracInset(bool atop) : atop_(atop) {} @@ -31,7 +34,7 @@ void MathFracInset::metrics(MathMetricsInfo const & mi) const smallerStyleFrac(m); xcell(0).metrics(m); xcell(1).metrics(m); - width_ = std::max(xcell(0).width(), xcell(1).width()) + 4; + width_ = max(xcell(0).width(), xcell(1).width()) + 4; ascent_ = xcell(0).height() + 2 + 5; descent_ = xcell(1).height() + 2 - 5; } diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C index a766dac670..18bceae2b8 100644 --- a/src/mathed/math_gridinset.C +++ b/src/mathed/math_gridinset.C @@ -10,6 +10,12 @@ #include "debug.h" +using std::swap; +using std::max; +using std::min; +using std::vector; + + namespace { string verboseHLine(int n) @@ -221,8 +227,8 @@ void MathGridInset::metrics(MathMetricsInfo const & mi) const int desc = 0; for (col_type col = 0; col < ncols(); ++col) { MathXArray const & c = xcell(index(row, col)); - asc = std::max(asc, c.ascent()); - desc = std::max(desc, c.descent()); + asc = max(asc, c.ascent()); + desc = max(desc, c.descent()); } rowinfo_[row].ascent_ = asc; rowinfo_[row].descent_ = desc; @@ -263,7 +269,7 @@ void MathGridInset::metrics(MathMetricsInfo const & mi) const for (col_type col = 0; col < ncols(); ++col) { int wid = 0; for (row_type row = 0; row < nrows(); ++row) - wid = std::max(wid, xcell(index(row, col)).width()); + wid = max(wid, xcell(index(row, col)).width()); colinfo_[col].width_ = wid; } colinfo_[ncols()].width_ = 0; @@ -439,7 +445,7 @@ void MathGridInset::addCol(col_type newcol) for (col_type col = 0; col < nc; ++col) new_cells[row * (nc + 1) + col + (col > newcol)] = cells_[row * nc + col]; - std::swap(cells_, new_cells); + swap(cells_, new_cells); ColInfo inf; inf.skip_ = defaultColSpace(newcol); @@ -457,7 +463,7 @@ void MathGridInset::delCol(col_type col) for (col_type i = 0; i < nargs(); ++i) if (i % ncols() != col) tmpcells.push_back(cells_[i]); - std::swap(cells_, tmpcells); + swap(cells_, tmpcells); colinfo_.erase(colinfo_.begin() + col); } @@ -637,14 +643,14 @@ MathGridInset::RowInfo & MathGridInset::rowinfo(row_type row) } -std::vector +vector MathGridInset::idxBetween(idx_type from, idx_type to) const { - row_type r1 = std::min(row(from), row(to)); - row_type r2 = std::max(row(from), row(to)); - col_type c1 = std::min(col(from), col(to)); - col_type c2 = std::max(col(from), col(to)); - std::vector res; + row_type r1 = min(row(from), row(to)); + row_type r2 = max(row(from), row(to)); + col_type c1 = min(col(from), col(to)); + col_type c2 = max(col(from), col(to)); + vector res; for (row_type i = r1; i <= r2; ++i) for (col_type j = c1; j <= c2; ++j) res.push_back(index(i, j)); diff --git a/src/mathed/math_hash.C b/src/mathed/math_hash.C index 5878967be6..f3d20ce72e 100644 --- a/src/mathed/math_hash.C +++ b/src/mathed/math_hash.C @@ -8,11 +8,13 @@ #include +using std::map; namespace { -// global -std::map theWordList; +// file scope +typedef map WordList; +WordList theWordList; struct key_type { @@ -197,6 +199,7 @@ void readSymbols(string const & filename) } } + void initSymbols() { unsigned const n = sizeof(wordlist_array) / sizeof(wordlist_array[0]); @@ -230,6 +233,6 @@ latexkeys const * in_word_set(string const & str) initialized = true; } - std::map::iterator it = theWordList.find(str); + WordList::iterator it = theWordList.find(str); return (it != theWordList.end()) ? &(it->second) : 0; } diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C index 49928c5de5..4d34cb134f 100644 --- a/src/mathed/math_hullinset.C +++ b/src/mathed/math_hullinset.C @@ -15,6 +15,8 @@ #include +using std::vector; +using std::max; using std::endl; namespace { @@ -168,7 +170,7 @@ void MathHullInset::metrics(MathMetricsInfo const & mi) const if (numberedType()) { int l = 0; for (row_type row = 0; row < nrows(); ++row) - l = std::max(l, mathed_string_width(LM_TC_BF, mi_, nicelabel(row))); + l = max(l, mathed_string_width(LM_TC_BF, mi_, nicelabel(row))); if (l) width_ += 30 + l; @@ -178,8 +180,8 @@ void MathHullInset::metrics(MathMetricsInfo const & mi) const int asc = 0; int des = 0; math_font_max_dim(LM_TC_TEXTRM, mi_, asc, des); - ascent_ = std::max(ascent_, asc); - descent_ = std::max(descent_, des); + ascent_ = max(ascent_, asc); + descent_ = max(descent_, des); } @@ -244,9 +246,9 @@ bool MathHullInset::display() const } -std::vector const MathHullInset::getLabelList() const +vector const MathHullInset::getLabelList() const { - std::vector res; + vector res; for (row_type row = 0; row < nrows(); ++row) if (!label_[row].empty() && nonum_[row] != 1) res.push_back(label_[row]); diff --git a/src/mathed/math_inset.C b/src/mathed/math_inset.C index 5b1f844aed..57605c13be 100644 --- a/src/mathed/math_inset.C +++ b/src/mathed/math_inset.C @@ -28,13 +28,17 @@ #include "debug.h" +using std::ostream; +using std::vector; + + int MathInset::height() const { return ascent() + descent(); } -std::ostream & operator<<(std::ostream & os, MathInset const & inset) +ostream & operator<<(ostream & os, MathInset const & inset) { WriteStream wi(os, false); inset.write(wi); @@ -180,10 +184,10 @@ void MathInset::validate(LaTeXFeatures &) const {} -std::vector +vector MathInset::idxBetween(idx_type from, idx_type to) const { - std::vector res; + vector res; for (idx_type i = from; i <= to; ++i) res.push_back(i); return res; diff --git a/src/mathed/math_macro.C b/src/mathed/math_macro.C index 70d066b1b6..b1697fa119 100644 --- a/src/mathed/math_macro.C +++ b/src/mathed/math_macro.C @@ -31,6 +31,9 @@ #include "LaTeXFeatures.h" +using std::max; + + MathMacro::MathMacro(string const & name) : MathNestInset(MathMacroTable::provide(name)->asMacroTemplate()->numargs()), tmplate_(MathMacroTable::provide(name)) @@ -89,9 +92,9 @@ void MathMacro::metrics(MathMetricsInfo const & mi) const for (idx_type i = 0; i < nargs(); ++i) { MathXArray const & c = xcell(i); c.metrics(mi_); - width_ = std::max(width_, c.width() + lwid); - descent_ += std::max(c.ascent(), lasc) + 5; - descent_ += std::max(c.descent(), ldes) + 5; + width_ = max(width_, c.width() + lwid); + descent_ += max(c.ascent(), lasc) + 5; + descent_ += max(c.descent(), ldes) + 5; } return; } @@ -129,12 +132,12 @@ void MathMacro::draw(Painter & pain, int x, int y) const for (idx_type i = 0; i < nargs(); ++i) { MathXArray const & c = xcell(i); - h += std::max(c.ascent(), lasc) + 5; + h += max(c.ascent(), lasc) + 5; c.draw(pain, x + lwid, h); char str[] = "#1:"; str[1] += static_cast(i); drawStr(pain, LM_TC_TEX, mi_, x + 3, h, str); - h += std::max(c.descent(), ldes) + 5; + h += max(c.descent(), ldes) + 5; } return; } diff --git a/src/mathed/math_macroarg.C b/src/mathed/math_macroarg.C index 6898f15366..c19a56b920 100644 --- a/src/mathed/math_macroarg.C +++ b/src/mathed/math_macroarg.C @@ -10,13 +10,15 @@ #include "debug.h" +using std::endl; + MathMacroArgument::MathMacroArgument(int n, MathTextCodes code) : MathNestInset(1), number_(n), expanded_(false), code_(code) { if (n < 1 || n > 9) { lyxerr << "MathMacroArgument::MathMacroArgument: wrong Argument id: " - << n << std::endl; + << n << endl; } str_[0] = '#'; str_[1] = static_cast('0' + n); diff --git a/src/mathed/math_macrotemplate.C b/src/mathed/math_macrotemplate.C index 3fe31bc7b7..d4f97a21d7 100644 --- a/src/mathed/math_macrotemplate.C +++ b/src/mathed/math_macrotemplate.C @@ -8,6 +8,9 @@ #include "debug.h" +using std::endl; + + MathMacroTemplate::MathMacroTemplate() : MathNestInset(1), numargs_(0), name_() {} @@ -18,7 +21,7 @@ MathMacroTemplate::MathMacroTemplate(string const & nm, int numargs) { if (numargs_ > 9) lyxerr << "MathMacroTemplate::MathMacroTemplate: wrong # of arguments: " - << numargs_ << std::endl; + << numargs_ << endl; } diff --git a/src/mathed/math_mathmlstream.C b/src/mathed/math_mathmlstream.C index a4bbcfce6c..bb87b1d232 100644 --- a/src/mathed/math_mathmlstream.C +++ b/src/mathed/math_mathmlstream.C @@ -7,7 +7,10 @@ #include "support/lyxalgo.h" -MathMLStream::MathMLStream(std::ostream & os) +using std::ostream; + + +MathMLStream::MathMLStream(ostream & os) : os_(os), tab_(0), line_(0), lastchar_(0) {} @@ -184,12 +187,12 @@ NormalStream & operator<<(NormalStream & ns, char c) ////////////////////////////////////////////////////////////////////// -WriteStream::WriteStream(std::ostream & os, bool fragile) +WriteStream::WriteStream(ostream & os, bool fragile) : os_(os), fragile_(fragile), firstitem_(false), line_(0) {} -WriteStream::WriteStream(std::ostream & os) +WriteStream::WriteStream(ostream & os) : os_(os), fragile_(false), firstitem_(false), line_(0) {} diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C index 5804afc3d0..b59643b981 100644 --- a/src/mathed/math_parser.C +++ b/src/mathed/math_parser.C @@ -87,6 +87,7 @@ using std::ios; using std::endl; using std::stack; using std::fill; +using std::vector; //#define FILEDEBUG @@ -306,7 +307,7 @@ private: /// int lineno_; /// - std::vector tokens_; + vector tokens_; /// unsigned pos_; /// diff --git a/src/mathed/math_pos.C b/src/mathed/math_pos.C index 7b57373f2e..4c36ba1a0c 100644 --- a/src/mathed/math_pos.C +++ b/src/mathed/math_pos.C @@ -8,6 +8,8 @@ #include "support/LAssert.h" +using std::ostream; + MathCursorPos::MathCursorPos() : par_(0), idx_(0), pos_(0) {} @@ -61,7 +63,7 @@ int MathCursorPos::ypos() const } -std::ostream & operator<<(std::ostream & os, MathCursorPos const & p) +ostream & operator<<(ostream & os, MathCursorPos const & p) { os << "(par: " << p.par_ << " idx: " << p.idx_ << " pos: " << p.pos_ << ")"; return os; diff --git a/src/mathed/math_rootinset.C b/src/mathed/math_rootinset.C index 41162470f1..597cf0a9ce 100644 --- a/src/mathed/math_rootinset.C +++ b/src/mathed/math_rootinset.C @@ -20,6 +20,9 @@ #include "Painter.h" +using std::max; + + MathRootInset::MathRootInset() : MathNestInset(2) {} @@ -34,8 +37,8 @@ MathInset * MathRootInset::clone() const void MathRootInset::metrics(MathMetricsInfo const & mi) const { MathNestInset::metrics(mi); - ascent_ = std::max(xcell(0).ascent() + 5, xcell(1).ascent()) + 2; - descent_ = std::max(xcell(1).descent() + 5, xcell(0).descent()) + 2; + ascent_ = max(xcell(0).ascent() + 5, xcell(1).ascent()) + 2; + descent_ = max(xcell(1).descent() + 5, xcell(0).descent()) + 2; width_ = xcell(0).width() + xcell(1).width() + 10; } @@ -43,8 +46,10 @@ void MathRootInset::metrics(MathMetricsInfo const & mi) const void MathRootInset::draw(Painter & pain, int x, int y) const { int const w = xcell(0).width(); - xcell(0).draw(pain, x, y - 5 - xcell(0).descent()); // the "exponent" - xcell(1).draw(pain, x + w + 8, y); // the "base" + // the "exponent" + xcell(0).draw(pain, x, y - 5 - xcell(0).descent()); + // the "base" + xcell(1).draw(pain, x + w + 8, y); int const a = ascent(); int const d = descent(); int xp[5]; diff --git a/src/mathed/math_scriptinset.C b/src/mathed/math_scriptinset.C index 68d975ee5e..2576987dea 100644 --- a/src/mathed/math_scriptinset.C +++ b/src/mathed/math_scriptinset.C @@ -10,6 +10,9 @@ #include "debug.h" +using std::max; + + MathScriptInset::MathScriptInset() : MathNestInset(2), limits_(0) { @@ -83,7 +86,7 @@ int MathScriptInset::dy0(MathInset const * nuc) const if (hasLimits(nuc)) des += nd + 2; else - des = std::max(des, nd); + des = max(des, nd); return des; } @@ -97,8 +100,8 @@ int MathScriptInset::dy1(MathInset const * nuc) const if (hasLimits(nuc)) asc += na + 2; else - asc = std::max(asc, na); - asc = std::max(asc, mathed_char_ascent(LM_TC_VAR, mi_, 'I')); + asc = max(asc, na); + asc = max(asc, mathed_char_ascent(LM_TC_VAR, mi_, 'I')); return asc; } @@ -142,14 +145,14 @@ int MathScriptInset::width2(MathInset const * nuc) const if (hasLimits(nuc)) { wid = nwid(nuc); if (hasUp()) - wid = std::max(wid, up().width()); + wid = max(wid, up().width()); if (hasDown()) - wid = std::max(wid, down().width()); + wid = max(wid, down().width()); } else { if (hasUp()) - wid = std::max(wid, up().width()); + wid = max(wid, up().width()); if (hasDown()) - wid = std::max(wid, down().width()); + wid = max(wid, down().width()); wid += nwid(nuc); } return wid; diff --git a/src/mathed/math_stackrelinset.C b/src/mathed/math_stackrelinset.C index 2c2e188751..6663718b20 100644 --- a/src/mathed/math_stackrelinset.C +++ b/src/mathed/math_stackrelinset.C @@ -7,6 +7,9 @@ #include "math_support.h" +using std::max; + + MathStackrelInset::MathStackrelInset() {} @@ -23,7 +26,7 @@ void MathStackrelInset::metrics(MathMetricsInfo const & mi) const smallerStyleFrac(m); xcell(0).metrics(m); xcell(1).metrics(mi); - width_ = std::max(xcell(0).width(), xcell(1).width()) + 4; + width_ = max(xcell(0).width(), xcell(1).width()) + 4; ascent_ = xcell(1).ascent() + xcell(0).height() + 4; descent_ = xcell(1).descent(); } diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C index 8bea104b7d..21ff9ae1eb 100644 --- a/src/mathed/math_support.C +++ b/src/mathed/math_support.C @@ -702,7 +702,7 @@ void mathed_draw_deco(Painter & pain, int x, int y, int w, int h, if (r >= 2) x += w; - for (int i = 0; d[i]; ) { + for (int i = 0; d[i];) { int code = int(d[i++]); if (code & 1) { // code == 1 || code == 3 double xx = d[i++]; diff --git a/src/mathed/math_symbolinset.C b/src/mathed/math_symbolinset.C index 121a1814cd..9bc6066d45 100644 --- a/src/mathed/math_symbolinset.C +++ b/src/mathed/math_symbolinset.C @@ -9,6 +9,9 @@ #include "debug.h" +using std::ostream; + + MathSymbolInset::MathSymbolInset(const latexkeys * l) : sym_(l), h_(0) {} @@ -33,7 +36,7 @@ MathInset * MathSymbolInset::clone() const MathTextCodes MathSymbolInset::code() const { - switch(sym_->token) { + switch (sym_->token) { case LM_TK_CMR: return LM_TC_CMR; case LM_TK_CMSY: @@ -183,7 +186,7 @@ void MathSymbolInset::write(WriteStream & os) const } -void MathSymbolInset::infoize(std::ostream & os) const +void MathSymbolInset::infoize(ostream & os) const { os << '\\' << name(); } diff --git a/src/mathed/math_undersetinset.C b/src/mathed/math_undersetinset.C index 5e42606b42..112401e823 100644 --- a/src/mathed/math_undersetinset.C +++ b/src/mathed/math_undersetinset.C @@ -7,6 +7,9 @@ #include "math_support.h" +using std::max; + + MathUndersetInset::MathUndersetInset() {} @@ -23,7 +26,7 @@ void MathUndersetInset::metrics(MathMetricsInfo const & mi) const smallerStyleFrac(m); xcell(0).metrics(m); xcell(1).metrics(mi); - width_ = std::max(xcell(0).width(), xcell(1).width()) + 4; + width_ = max(xcell(0).width(), xcell(1).width()) + 4; ascent_ = xcell(1).ascent(); descent_ = xcell(1).descent() + xcell(0).height() + 4; } diff --git a/src/mathed/math_xdata.C b/src/mathed/math_xdata.C index 8f4ba899bd..cab9a2c337 100644 --- a/src/mathed/math_xdata.C +++ b/src/mathed/math_xdata.C @@ -10,6 +10,10 @@ #include "debug.h" +using std::max; +using std::min; + + extern MathScriptInset const * asScript(MathArray::const_iterator it); @@ -36,14 +40,14 @@ void MathXArray::metrics(MathMetricsInfo const & mi) const MathScriptInset const * q = (it + 1 == end()) ? 0 : asScript(it); if (q) { q->metrics(p, mi); - ascent_ = std::max(ascent_, q->ascent2(p)); - descent_ = std::max(descent_, q->descent2(p)); + ascent_ = max(ascent_, q->ascent2(p)); + descent_ = max(descent_, q->descent2(p)); width_ += q->width2(p); ++it; } else { p->metrics(mi); - ascent_ = std::max(ascent_, p->ascent()); - descent_ = std::max(descent_, p->descent()); + ascent_ = max(ascent_, p->ascent()); + descent_ = max(descent_, p->descent()); width_ += p->width(); } } @@ -80,7 +84,7 @@ void MathXArray::draw(Painter & pain, int x, int y) const int MathXArray::pos2x(size_type targetpos) const { int x = 0; - const_iterator target = std::min(begin() + targetpos, end()); + const_iterator target = min(begin() + targetpos, end()); for (const_iterator it = begin(); it < target; ++it) { MathInset const * p = it->nucleus(); MathScriptInset const * q = (it + 1 == end()) ? 0 : asScript(it); @@ -102,7 +106,7 @@ MathArray::size_type MathXArray::x2pos(int targetx) const const_iterator it = begin(); int lastx = 0; int currx = 0; - for ( ; currx < targetx && it < end(); ++it) { + for (; currx < targetx && it < end(); ++it) { lastx = currx; int wid = 0; @@ -192,7 +196,7 @@ void MathXArray::towards(int & x, int & y) const center(cx, cy); double r = 1.0; - int dist = (x - cx) * (x - cx) + (y - cy) * (y - cy); + //int dist = (x - cx) * (x - cx) + (y - cy) * (y - cy); x = cx + int(r * (x - cx)); y = cy + int(r * (y - cy)); diff --git a/src/mathed/math_xyarrowinset.C b/src/mathed/math_xyarrowinset.C index 73f14eac5f..39af945285 100644 --- a/src/mathed/math_xyarrowinset.C +++ b/src/mathed/math_xyarrowinset.C @@ -13,6 +13,9 @@ #include "debug.h" +using std::max; + + MathXYArrowInset::MathXYArrowInset() : MathNestInset(2) {} @@ -68,7 +71,7 @@ void MathXYArrowInset::metrics(MathMetricsInfo const & mi) const if (editing()) { int w = mathed_string_width(LM_TC_TEXTRM, mi_, "target: "); - width_ = w + std::max(xcell(0).width(), xcell(1).width()); + width_ = w + max(xcell(0).width(), xcell(1).width()); ascent_ = xcell(0).ascent(); descent_ = xcell(0).descent() + xcell(1).height() + 10; } else { @@ -93,9 +96,9 @@ void MathXYArrowInset::draw(Painter & pain, int x, int y) const xcell(0).draw(pain, x + lwid, y); drawStr(pain, LM_TC_TEXTRM, mi_, x + 3, y, "target"); - y += std::max(xcell(0).descent(), ldes) + 5; + y += max(xcell(0).descent(), ldes) + 5; - y += std::max(xcell(1).ascent(), lasc) + 5; + y += max(xcell(1).ascent(), lasc) + 5; xcell(1).draw(pain, x + lwid, y); drawStr(pain, LM_TC_TEXTRM, mi_, x + 3, y, "label"); diff --git a/src/minibuffer.C b/src/minibuffer.C index 152cd3eb8e..f660a6e697 100644 --- a/src/minibuffer.C +++ b/src/minibuffer.C @@ -36,6 +36,8 @@ using SigC::slot; using std::vector; +using std::back_inserter; +using std::find; extern LyXAction lyxaction; @@ -147,7 +149,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key) vector comp; lyx::copy_if(completion_.begin(), completion_.end(), - std::back_inserter(comp), prefix(input)); + back_inserter(comp), prefix(input)); if (comp.empty()) { // No matches @@ -171,7 +173,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key) vector vtmp; lyx::copy_if(comp.begin(), comp.end(), - std::back_inserter(vtmp), + back_inserter(vtmp), prefix(test)); if (vtmp.size() != comp.size()) { test.erase(test.length() - 1); @@ -211,7 +213,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key) // of argumetns LFUN's should have first. (Lgb) // First check for match vector::const_iterator cit = - std::find(completion_.begin(), + find(completion_.begin(), completion_.end(), input); if (cit == completion_.end()) { diff --git a/src/paragraph.C b/src/paragraph.C index 3614a65d61..fd27bfb846 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -1179,14 +1179,14 @@ Paragraph const * Paragraph::depthHook(depth_type depth) const Paragraph * Paragraph::outerHook() { - if(!getDepth()) + if (!getDepth()) return 0; return depthHook(depth_type(getDepth() - 1)); } Paragraph const * Paragraph::outerHook() const { - if(!getDepth()) + if (!getDepth()) return 0; return depthHook(depth_type(getDepth() - 1)); } @@ -1248,7 +1248,7 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf, texrow.newline(); } - if (tex_code_break_column && style.isCommand()){ + if (tex_code_break_column && style.isCommand()) { os << '\n'; texrow.newline(); } @@ -1268,7 +1268,7 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf, further_blank_line = true; } - if (further_blank_line){ + if (further_blank_line) { os << '\n'; texrow.newline(); } @@ -1400,7 +1400,7 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf, further_blank_line = true; } - if (further_blank_line){ + if (further_blank_line) { os << '\n'; texrow.newline(); } @@ -1929,7 +1929,7 @@ bool Paragraph::isLetter(pos_type pos) const } -bool Paragraph::isWord(pos_type pos ) const +bool Paragraph::isWord(pos_type pos) const { return IsWordChar(getChar(pos)) ; } diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C index ab9ba6d170..aaa4125d38 100644 --- a/src/paragraph_pimpl.C +++ b/src/paragraph_pimpl.C @@ -26,6 +26,10 @@ #include "support/LAssert.h" using lyx::pos_type; +using std::endl; +using std::ostream; +using std::upper_bound; +using std::lower_bound; extern int tex_code_break_column; @@ -112,7 +116,7 @@ void Paragraph::Pimpl::insertChar(pos_type pos, value_type c, // Update the font table. FontTable search_font(pos, LyXFont()); - for (FontList::iterator it = std::lower_bound(fontlist.begin(), + for (FontList::iterator it = lower_bound(fontlist.begin(), fontlist.end(), search_font, matchFT()); it != fontlist.end(); ++it) @@ -122,7 +126,7 @@ void Paragraph::Pimpl::insertChar(pos_type pos, value_type c, // Update the inset table. InsetTable search_inset(pos, 0); - for (InsetList::iterator it = std::lower_bound(owner_->insetlist.begin(), + for (InsetList::iterator it = lower_bound(owner_->insetlist.begin(), owner_->insetlist.end(), search_inset, matchIT()); it != owner_->insetlist.end(); ++it) @@ -144,12 +148,12 @@ void Paragraph::Pimpl::insertInset(pos_type pos, // Add a new entry in the inset table. InsetTable search_inset(pos, 0); - InsetList::iterator it = std::lower_bound(owner_->insetlist.begin(), + InsetList::iterator it = lower_bound(owner_->insetlist.begin(), owner_->insetlist.end(), search_inset, matchIT()); if (it != owner_->insetlist.end() && it->pos == pos) { lyxerr << "ERROR (Paragraph::InsertInset): " - "there is an inset in position: " << pos << std::endl; + "there is an inset in position: " << pos << endl; } else { owner_->insetlist.insert(it, InsetTable(pos, inset)); inset->parOwner(owner_); @@ -168,7 +172,7 @@ void Paragraph::Pimpl::erase(pos_type pos) // find the entry InsetTable search_inset(pos, 0); InsetList::iterator it = - std::lower_bound(owner_->insetlist.begin(), + lower_bound(owner_->insetlist.begin(), owner_->insetlist.end(), search_inset, matchIT()); if (it != owner_->insetlist.end() && it->pos == pos) { @@ -183,7 +187,7 @@ void Paragraph::Pimpl::erase(pos_type pos) FontTable search_font(pos, LyXFont()); FontList::iterator it = - std::lower_bound(fontlist.begin(), + lower_bound(fontlist.begin(), fontlist.end(), search_font, matchFT()); if (it != fontlist.end() && it->pos() == pos && @@ -213,7 +217,7 @@ void Paragraph::Pimpl::erase(pos_type pos) InsetTable search_inset(pos, 0); InsetList::iterator lend = owner_->insetlist.end(); for (InsetList::iterator it = - std::upper_bound(owner_->insetlist.begin(), + upper_bound(owner_->insetlist.begin(), lend, search_inset, matchIT()); it != lend; ++it) @@ -221,7 +225,7 @@ void Paragraph::Pimpl::erase(pos_type pos) } -void Paragraph::Pimpl::simpleTeXBlanks(std::ostream & os, TexRow & texrow, +void Paragraph::Pimpl::simpleTeXBlanks(ostream & os, TexRow & texrow, pos_type const i, int & column, LyXFont const & font, LyXLayout const & style) @@ -278,7 +282,7 @@ bool Paragraph::Pimpl::isTextAt(BufferParams const & bp, void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf, BufferParams const & bparams, - std::ostream & os, + ostream & os, TexRow & texrow, bool moving_arg, LyXFont & font, @@ -511,9 +515,9 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf, Paragraph * Paragraph::Pimpl::TeXDeeper(Buffer const * buf, BufferParams const & bparams, - std::ostream & os, TexRow & texrow) + ostream & os, TexRow & texrow) { - lyxerr[Debug::LATEX] << "TeXDeeper... " << this << std::endl; + lyxerr[Debug::LATEX] << "TeXDeeper... " << this << endl; Paragraph * par = owner_; while (par && par->params().depth() == owner_->params().depth()) { @@ -526,7 +530,7 @@ Paragraph * Paragraph::Pimpl::TeXDeeper(Buffer const * buf, os, texrow, false); } } - lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << std::endl; + lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << endl; return par; } diff --git a/src/screen.C b/src/screen.C index 616b0916e4..b76facc058 100644 --- a/src/screen.C +++ b/src/screen.C @@ -290,7 +290,7 @@ void LyXScreen::showManualCursor(LyXText const * text, int x, int y, // Secure against very strange situations int const y2 = max(y_tmp, y1); - if (cursor_pixmap){ + if (cursor_pixmap) { XFreePixmap(fl_get_display(), cursor_pixmap); cursor_pixmap = 0; } @@ -360,7 +360,7 @@ void LyXScreen::hideCursor() { if (!cursor_visible) return; - if (cursor_pixmap){ + if (cursor_pixmap) { XCopyArea (fl_get_display(), cursor_pixmap, owner.getWin(), diff --git a/src/sp_base.h b/src/sp_base.h index 5be1069047..b15631b3e5 100644 --- a/src/sp_base.h +++ b/src/sp_base.h @@ -1,3 +1,4 @@ +// -*- C++ -*- #ifndef SP_BASE_H #define SP_BASE_H @@ -23,7 +24,7 @@ class SpellBase virtual ~SpellBase() {} - virtual void initialize(BufferParams const & , string const & ) = 0; + virtual void initialize(BufferParams const & , string const &) = 0; virtual bool alive() = 0; @@ -33,11 +34,11 @@ class SpellBase virtual void close() = 0; - virtual void insert(string const & ) = 0; + virtual void insert(string const &) = 0; - virtual void accept(string const & ) = 0; + virtual void accept(string const &) = 0; - virtual void store(string const & , string const & ) = 0; + virtual void store(string const & , string const &) = 0; virtual char const * error() = 0; diff --git a/src/support/Makefile.am b/src/support/Makefile.am index 319d68fd9e..a42cf9b87d 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign DISTCLEANFILES= *.orig *.rej *~ *.bak core MAINTAINERCLEANFILES = $(srcdir)/Makefile.in -noinst_LTLIBRARIES = libsupport.la +noinst_LTLIBRARIES = libsupport.o LIBS = ETAGS_ARGS = --lang=c++ BOOST_INCLUDES = -I$(top_srcdir)/boost @@ -17,7 +17,7 @@ if USE_REGEX REGEX = regex.c lyxregex.h endif -libsupport_la_SOURCES = \ +libsupport_o_SOURCES = \ DebugStream.C \ DebugStream.h \ FileInfo.C \ diff --git a/src/support/copy.C b/src/support/copy.C index e9061065dc..b89f215949 100644 --- a/src/support/copy.C +++ b/src/support/copy.C @@ -5,14 +5,21 @@ #include "support/lyxlib.h" #include "LString.h" +using std::ifstream; +using std::ofstream; +using std::ios; + bool lyx::copy(string const & from, string const & to) { - std::ifstream ifs(from.c_str()); - if (!ifs) return false; - std::ofstream ofs(to.c_str(), - std::ios::binary | std::ios::out | std::ios::trunc); - if (!ofs) return false; + ifstream ifs(from.c_str()); + if (!ifs) + return false; + ofstream ofs(to.c_str(), + ios::binary | ios::out | ios::trunc); + if (!ofs) + return false; ofs << ifs.rdbuf(); - if (ofs.good()) return true; + if (ofs.good()) + return true; return false; } diff --git a/src/support/lstrings.C b/src/support/lstrings.C index 03760081a6..33a11b8386 100644 --- a/src/support/lstrings.C +++ b/src/support/lstrings.C @@ -216,13 +216,13 @@ double strToDbl(string const & str) char lowercase(char c) { - return char( tolower(c) ); + return char(tolower(c)); } char uppercase(char c) { - return char( toupper(c) ); + return char(toupper(c)); } diff --git a/src/support/lstrings.h b/src/support/lstrings.h index 6be7f9ddaa..72001459ad 100644 --- a/src/support/lstrings.h +++ b/src/support/lstrings.h @@ -145,6 +145,19 @@ bool contains(string const & a, char b); /// bool contains(char const * a, char const * b); +/// This should probably we rewritten to be more general. +class contains_functor { +public: + typedef string first_argument_type; + typedef string second_argument_type; + typedef bool result_type; + + bool operator()(string const & haystack, string const & needle) const { + return contains(haystack, needle); + } +}; + + /// bool containsOnly(string const &, char const *); diff --git a/src/support/lyxfunctional.h b/src/support/lyxfunctional.h index 94c8504418..fbbbb78076 100644 --- a/src/support/lyxfunctional.h +++ b/src/support/lyxfunctional.h @@ -217,38 +217,42 @@ compare_memfun(R(C::*p)() const, A const & a) // Functors used in the template. /// -template +template class equal_1st_in_pair { public: /// - equal_1st_in_pair(T1 const & value) : value_(value) {} + typedef typename T::first_type first_type; /// - typedef std::pair pair_type; + typedef T pair_type; + /// + equal_1st_in_pair(first_type const & value) : value_(value) {} /// bool operator() (pair_type const & p) const { return p.first == value_; } private: /// - T1 const & value_; + first_type const & value_; }; /// -template +template class equal_2nd_in_pair { public: /// - equal_2nd_in_pair(T2 const & value) : value_(value) {} + typedef typename T::second_type second_type; + /// + typedef T pair_type; /// - typedef std::pair pair_type; + equal_2nd_in_pair(second_type const & value) : value_(value) {} /// bool operator() (pair_type const & p) const { return p.second == value_; } private: /// - T2 const & value_; + second_type const & value_; }; } // end of namespace lyx diff --git a/src/support/lyxsum.C b/src/support/lyxsum.C index 5981a75a35..a4a1eacb88 100644 --- a/src/support/lyxsum.C +++ b/src/support/lyxsum.C @@ -16,8 +16,6 @@ #include "support/lyxlib.h" #include "debug.h" -using std::endl; - // Various implementations of lyx::sum(), depending on what methods // are available. Order is faster to slowest. #if defined(HAVE_MMAP) && defined(HAVE_MUNMAP) @@ -32,13 +30,21 @@ using std::endl; #include #include +using std::ifstream; +using std::endl; +using std::for_each; +using std::istreambuf_iterator; +using std::istream_iterator; +using std::ios; + + unsigned long lyx::sum(string const & file) { lyxerr[Debug::FILES] << "lyx::sum() using mmap (lightning fast)" << endl; int fd = open(file.c_str(), O_RDONLY); - if(!fd) + if (!fd) return 0; struct stat info; @@ -76,7 +82,7 @@ inline unsigned long do_crc(InputIterator first, InputIterator last) { boost::crc_32_type crc; - crc = std::for_each(first, last, crc); + crc = for_each(first, last, crc); return crc.checksum(); } @@ -88,11 +94,11 @@ unsigned long lyx::sum(string const & file) lyxerr[Debug::FILES] << "lyx::sum() using istreambuf_iterator (fast)" << endl; - std::ifstream ifs(file.c_str()); + ifstream ifs(file.c_str()); if (!ifs) return 0; - std::istreambuf_iterator beg(ifs); - std::istreambuf_iterator end; + istreambuf_iterator beg(ifs); + istreambuf_iterator end; return do_crc(beg,end); } @@ -103,12 +109,12 @@ unsigned long lyx::sum(string const & file) << "lyx::sum() using istream_iterator (slow as a snail)" << endl; - std::ifstream ifs(file.c_str()); + ifstream ifs(file.c_str()); if (!ifs) return 0; - ifs.unsetf(std::ios::skipws); - std::istream_iterator beg(ifs); - std::istream_iterator end; + ifs.unsetf(ios::skipws); + istream_iterator beg(ifs); + istream_iterator end; return do_crc(beg,end); } diff --git a/src/support/os.C b/src/support/os.C index cafcb27ac2..3713e4938c 100644 --- a/src/support/os.C +++ b/src/support/os.C @@ -4,7 +4,7 @@ #ifdef __EMX__ #include "os_os2.C" -#elif defined(__CYGWIN__) || defined( __CYGWIN32__) +#elif defined(__CYGWIN__) || defined(__CYGWIN32__) #include "os_win32.C" #else #include "os_unix.C" diff --git a/src/support/smart_ptr.h b/src/support/smart_ptr.h index 9891749314..3eb7186fa7 100644 --- a/src/support/smart_ptr.h +++ b/src/support/smart_ptr.h @@ -103,7 +103,7 @@ template class shared_c_ptr { return *this; } -#if !defined( BOOST_NO_MEMBER_TEMPLATES ) +#if !defined(BOOST_NO_MEMBER_TEMPLATES) template shared_c_ptr(const shared_c_ptr& r) : px(r.px) { // never throws ++*(pn = r.pn); @@ -158,7 +158,7 @@ template class shared_c_ptr { #endif void reset(T* p=0) { - if ( px == p ) return; // fix: self-assignment safe + if (px == p) return; // fix: self-assignment safe if (--*pn == 0) { checked_delete(px); } else { // allocate new reference counter #ifndef LYX_NO_EXCEPTIONS @@ -190,7 +190,7 @@ template class shared_c_ptr { // Tasteless as this may seem, making all members public allows member templates // to work in the absence of member template friends. (Matthew Langston) // Don't split this line into two; that causes problems for some GCC 2.95.2 builds -#if defined(BOOST_NO_MEMBER_TEMPLATES) || !defined( BOOST_NO_MEMBER_TEMPLATE_FRIENDS ) +#if defined(BOOST_NO_MEMBER_TEMPLATES) || !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS) private: #endif diff --git a/src/support/textutils.h b/src/support/textutils.h index 448decfd43..d399924c1d 100644 --- a/src/support/textutils.h +++ b/src/support/textutils.h @@ -103,10 +103,10 @@ bool IsPrintableNonspace(unsigned char c) { /// Word is not IsSeparator or IsKomma or IsHfill or IsFloat or IsInset. inline bool IsWordChar(unsigned char c) { - return !( IsSeparatorChar( c ) - || IsKommaChar( c ) - || IsHfillChar( c ) - || IsInsetChar( c )); + return !(IsSeparatorChar(c) + || IsKommaChar(c) + || IsHfillChar(c) + || IsInsetChar(c)); } diff --git a/src/support/translator.h b/src/support/translator.h index e211aa468d..aff39251d9 100644 --- a/src/support/translator.h +++ b/src/support/translator.h @@ -54,7 +54,7 @@ public: // For explanation see the next find() function. Map::const_iterator it = std::find_if(map.begin(), map.end(), - lyx::equal_1st_in_pair(first) + lyx::equal_1st_in_pair(first) ); if (it != map.end()) { @@ -78,10 +78,10 @@ public: // to take only the second value of the pair to be compared. // // We can depict it as follows: - // equal_to( select2nd(pair) , second) + // equal_to(select2nd(pair) , second) Map::const_iterator it = std::find_if(map.begin(), map.end(), - lyx::equal_2nd_in_pair(second) + lyx::equal_2nd_in_pair(second) ); if (it != map.end()) diff --git a/src/tabular.C b/src/tabular.C index 97b1a00ad9..83a25fb9eb 100644 --- a/src/tabular.C +++ b/src/tabular.C @@ -562,7 +562,7 @@ int LyXTabular::GetAdditionalHeight(int row) const } } for (int column = 0; column < columns_ && top; ++column) { - switch (cell_info[row][column].multicolumn){ + switch (cell_info[row][column].multicolumn) { case LyXTabular::CELL_BEGIN_OF_MULTICOLUMN: top = cell_info[row][column].top_line; break; @@ -885,7 +885,7 @@ int LyXTabular::GetBeginningOfTextInCell(int cell) const { int x = 0; - switch (GetAlignment(cell)){ + switch (GetAlignment(cell)) { case LYX_ALIGN_CENTER: x += (GetWidthOfColumn(cell) - GetWidthOfCell(cell)) / 2; break; @@ -1884,7 +1884,7 @@ int LyXTabular::TeXTopHLine(ostream & os, int row) const if (TopLine(i)) ++tmp; } - if (tmp == (n - fcell)){ + if (tmp == (n - fcell)) { os << "\\hline "; } else if (tmp) { for (int i = fcell; i < n; ++i) { @@ -1917,7 +1917,7 @@ int LyXTabular::TeXBottomHLine(ostream & os, int row) const if (BottomLine(i)) ++tmp; } - if (tmp == (n-fcell)){ + if (tmp == (n - fcell)) { os << "\\hline"; } else if (tmp) { for (int i = fcell; i < n; ++i) { @@ -2036,7 +2036,7 @@ int LyXTabular::TeXCellPostamble(ostream & os, int cell) const os << "%\n\\end{minipage}"; ret += 2; } - if (IsMultiColumn(cell)){ + if (IsMultiColumn(cell)) { os << '}'; } if (GetRotateCell(cell)) { @@ -2360,27 +2360,27 @@ int LyXTabular::docBook(Buffer const * buf, ostream & os) const #warning Jose please have a look here I changed the longtable header/footer #warning ---- options so I had to disable the docbook code (Jug 20011219) #if 0 - if ( IsLongTabular() ) { + if (IsLongTabular()) { // Header - if(endhead.row || endfirsthead.row ) { + if (endhead.row || endfirsthead.row) { os << "\n"; - if( endfirsthead.row ) { - docbookRow( buf, os, endfirsthead.row - 1); + if (endfirsthead.row) { + docbookRow(buf, os, endfirsthead.row - 1); } - if( endhead.row && endhead.row != endfirsthead.row) { + if (endhead.row && endhead.row != endfirsthead.row) { docbookRow(buf, os, endhead.row - 1); } os << "\n"; } // Footer - if( endfoot.row || endlastfoot.row ) { + if (endfoot.row || endlastfoot.row) { os << "\n"; - if( endfoot.row ) { - docbookRow( buf, os, endfoot.row - 1); + if (endfoot.row) { + docbookRow(buf, os, endfoot.row - 1); } - if( endlastfoot.row && endlastfoot.row != endfoot.row) { - docbookRow( buf, os, endlastfoot.row - 1); + if (endlastfoot.row && endlastfoot.row != endfoot.row) { + docbookRow(buf, os, endlastfoot.row - 1); } os << "\n"; } @@ -2392,10 +2392,10 @@ int LyXTabular::docBook(Buffer const * buf, ostream & os) const os << "\n"; for (int i = 0; i < rows_; ++i) { - if(!IsLongTabular() || ( + if (!IsLongTabular() || ( !row_info[i].endhead && !row_info[i].endfirsthead && !row_info[i].endfoot && !row_info[i].endlastfoot)) { - docbookRow( buf, os, i); + docbookRow(buf, os, i); } } os << "\n"; @@ -2701,12 +2701,12 @@ void LyXTabular::Validate(LaTeXFeatures & features) const } -std::vector const LyXTabular::getLabelList() const +vector const LyXTabular::getLabelList() const { - std::vector label_list; + vector label_list; for (int i = 0; i < rows_; ++i) for (int j = 0; j < columns_; ++j) { - std::vector const l = + vector const l = GetCellInset(i, j)->getLabelList(); label_list.insert(label_list.end(), l.begin(), l.end()); diff --git a/src/tabular_funcs.C b/src/tabular_funcs.C index 72d28384a4..a9d907f513 100644 --- a/src/tabular_funcs.C +++ b/src/tabular_funcs.C @@ -41,7 +41,7 @@ string const write_attribute(string const & name, LyXLength const & value) string const tostr(LyXAlignment const & num) { - switch(num) { + switch (num) { case LYX_ALIGN_NONE: return "none"; case LYX_ALIGN_BLOCK: @@ -63,7 +63,7 @@ string const tostr(LyXAlignment const & num) string const tostr(LyXTabular::VAlignment const & num) { - switch(num) { + switch (num) { case LyXTabular::LYX_VALIGN_TOP: return "top"; case LyXTabular::LYX_VALIGN_CENTER: @@ -77,7 +77,7 @@ string const tostr(LyXTabular::VAlignment const & num) string const tostr(LyXTabular::BoxType const & num) { - switch(num) { + switch (num) { case LyXTabular::BOX_NONE: return "none"; case LyXTabular::BOX_PARBOX: diff --git a/src/tex-accent.C b/src/tex-accent.C index bcbeff0399..a184f74291 100644 --- a/src/tex-accent.C +++ b/src/tex-accent.C @@ -75,7 +75,7 @@ tex_accent_struct lyx_accent_table[18] = { tex_accent_struct get_accent(kb_action action) { int i = 0; - while (i <= TEX_MAX_ACCENT){ + while (i <= TEX_MAX_ACCENT) { if (lyx_accent_table[i].action == action) return lyx_accent_table[i]; ++i; diff --git a/src/texrow.C b/src/texrow.C index c67c88392e..5d9f3116d4 100644 --- a/src/texrow.C +++ b/src/texrow.C @@ -57,7 +57,7 @@ void TexRow::newline() class same_rownumber { public: - same_rownumber(TexRow::RowList::value_type const & v):vt(v){} + same_rownumber(TexRow::RowList::value_type const & v):vt(v) {} bool operator()(TexRow::RowList::value_type const & vt1) const { return vt.rownumber() == vt1.rownumber(); } diff --git a/src/text.C b/src/text.C index aebf486c8e..b369b02330 100644 --- a/src/text.C +++ b/src/text.C @@ -80,7 +80,7 @@ int LyXText::workWidth(BufferView * bview, Inset * inset) const " fall back to the brute force method" << endl; Buffer::inset_iterator it = bview->buffer()->inset_iterator_begin(); Buffer::inset_iterator end = bview->buffer()->inset_iterator_end(); - for ( ; it != end; ++it) { + for (; it != end; ++it) { if (*it == inset) { par = it.getPar(); pos = it.getPos(); @@ -1824,7 +1824,7 @@ void LyXText::insertChar(BufferView * bview, char c) getFont(bview->buffer(), cursor.par(), cursor.pos() - 1).number() == LyXFont::ON) - ) + ) number(bview); // Set current_font.number to OFF } else if (IsDigit(c) && real_current_font.isVisibleRightToLeft()) { @@ -1835,8 +1835,8 @@ void LyXText::insertChar(BufferView * bview, char c) if (contains(number_unary_operators, c) && (cursor.pos() == 1 || cursor.par()->isSeparator(cursor.pos() - 2) || - cursor.par()->isNewline(cursor.pos() - 2) ) - ) { + cursor.par()->isNewline(cursor.pos() - 2)) + ) { setCharFont(bview->buffer(), cursor.par(), cursor.pos() - 1, @@ -2211,7 +2211,7 @@ void LyXText::cursorRightOneWord(BufferView * bview) const } // Advance through word. while (tmpcursor.pos() < tmpcursor.par()->size() && - tmpcursor.par()->isWord( tmpcursor.pos())) { + tmpcursor.par()->isWord(tmpcursor.pos())) { // printf("Current pos2 %d", tmpcursor.pos()) ; tmpcursor.pos(tmpcursor.pos() + 1); ++steps; @@ -2228,7 +2228,7 @@ void LyXText::cursorTab(BufferView * bview) const && !tmpcursor.par()->isNewline(tmpcursor.pos())) tmpcursor.pos(tmpcursor.pos() + 1); - if (tmpcursor.pos() == tmpcursor.par()->size()){ + if (tmpcursor.pos() == tmpcursor.par()->size()) { if (tmpcursor.par()->next()) { tmpcursor.par(tmpcursor.par()->next()); tmpcursor.pos(0); @@ -2265,13 +2265,13 @@ void LyXText::cursorLeftOneWord(LyXCursor & cur) const || cur.par()->isHfill(cur.pos() - 1))) { cur.pos(cur.pos() - 1); } else if (!cur.pos()) { - if (cur.par()->previous()){ + if (cur.par()->previous()) { cur.par(cur.par()->previous()); cur.pos(cur.par()->size()); } } else { // Here, cur != 0 while (cur.pos() > 0 && - cur.par()->isWord(cur.pos()-1) ) + cur.par()->isWord(cur.pos()-1)) cur.pos(cur.pos() - 1); } } @@ -2283,7 +2283,7 @@ void LyXText::getWord(LyXCursor & from, LyXCursor & to, { // first put the cursor where we wana start to select the word from = cursor; - switch(loc) { + switch (loc) { case WHOLE_WORD_STRICT: if (cursor.pos() == 0 || cursor.pos() == cursor.par()->size() || cursor.par()->isSeparator(cursor.pos()) @@ -2315,7 +2315,7 @@ void LyXText::getWord(LyXCursor & from, LyXCursor & to, while (to.pos() < to.par()->size() && !to.par()->isSeparator(to.pos()) && !to.par()->isKomma(to.pos()) - && !to.par()->isHfill(to.pos()) ) + && !to.par()->isHfill(to.pos())) { to.pos(to.pos() + 1); } @@ -2332,7 +2332,7 @@ void LyXText::selectWord(BufferView * bview, word_location const loc) if (to == from) return; selection.cursor = cursor; - setCursor(bview, to.par(), to.pos() ); + setCursor(bview, to.par(), to.pos()); setSelection(bview); } @@ -2408,7 +2408,7 @@ string const LyXText::selectNextWordToSpellcheck(BufferView * bview, } // Update the value if we changed paragraphs - if (cursor.par() != tmppar){ + if (cursor.par() != tmppar) { setCursor(bview, cursor.par(), cursor.pos()); value = float(cursor.y())/float(height); } @@ -3210,14 +3210,14 @@ int LyXText::getLengthMarkerHeight(BufferView * bv, VSpace const & vsp) const LyXFont font; font.decSize(); - int const min_size = std::max(3 * arrow_size, + int const min_size = max(3 * arrow_size, lyxfont::maxAscent(font) + lyxfont::maxDescent(font)); if (vsp.length().len().value() < 0.0) return min_size; else - return std::max(min_size, space_size); + return max(min_size, space_size); } @@ -3447,7 +3447,7 @@ void LyXText::paintFirstRow(DrawRowParams & p) float x = p.x; if (layout.labeltype == LABEL_CENTERED_TOP_ENVIRONMENT) { x = ((is_rtl ? leftMargin(p.bv, p.row) : p.x) - + ww - rightMargin(buffer, p.row) ) / 2; + + ww - rightMargin(buffer, p.row)) / 2; x -= lyxfont::width(str, font) / 2; } else if (is_rtl) { x = ww - leftMargin(p.bv, p.row) - @@ -3786,8 +3786,8 @@ LyXText::getColumnNearX(BufferView * bview, Row * row, int & x, if (row->pos() > last) // Row is empty? c = row->pos(); else if (lastrow && - ( ( rtl && left_side && vc == row->pos() && x < tmpx - 5) || - (!rtl && !left_side && vc == last + 1 && x > tmpx + 5) )) + ((rtl && left_side && vc == row->pos() && x < tmpx - 5) || + (!rtl && !left_side && vc == last + 1 && x > tmpx + 5))) c = last + 1; else if (vc == row->pos()) { c = vis2log(vc); diff --git a/src/text2.C b/src/text2.C index 2f5d16f52b..74e7dff931 100644 --- a/src/text2.C +++ b/src/text2.C @@ -46,6 +46,7 @@ #include "support/textutils.h" #include "support/lstrings.h" +using std::vector; using std::copy; using std::find; using std::endl; @@ -272,7 +273,7 @@ void LyXText::setCharFont(BufferView * bv, Paragraph * par, layoutfont = layout.font; // Realize against environment font information - if (par->getDepth()){ + if (par->getDepth()) { Paragraph * tp = par; while (!layoutfont.resolved() && tp && tp->getDepth()) { tp = tp->outerHook(); @@ -322,7 +323,7 @@ void LyXText::setCharFont(Buffer const * buf, Paragraph * par, layoutfont = layout.font; // Realize against environment font information - if (par->getDepth()){ + if (par->getDepth()) { Paragraph * tp = par; while (!layoutfont.resolved() && tp && tp->getDepth()) { tp = tp->outerHook(); @@ -1622,7 +1623,7 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const par->incCounter(i); int number = par->getCounter(i); if (!par->bibkey) { - InsetCommandParams p( "bibitem" ); + InsetCommandParams p("bibitem" ); par->bibkey = new InsetBibKey(p); } par->bibkey->setCounter(number); @@ -1953,7 +1954,7 @@ void LyXText::insertStringAsParagraphs(BufferView * bview, string const & str) bool LyXText::gotoNextInset(BufferView * bview, - std::vector const & codes, + vector const & codes, string const & contents) const { LyXCursor res = cursor; diff --git a/src/trans.C b/src/trans.C index 81c4b71dfe..87caa575a4 100644 --- a/src/trans.C +++ b/src/trans.C @@ -13,6 +13,7 @@ #include "debug.h" #include "trans_mgr.h" +using std::map; using std::endl; @@ -181,9 +182,9 @@ int Trans::Load(LyXLex & lex) tex_accent accent_2= getkeymod(str); if (accent_2 == TEX_NOACCENT) return -1; - std::map::iterator it1 = + map::iterator it1 = kmod_list_.find(accent_1); - std::map::iterator it2 = + map::iterator it2 = kmod_list_.find(accent_2); if (it1 == kmod_list_.end() || it2 == kmod_list_.end()) { @@ -192,8 +193,8 @@ int Trans::Load(LyXLex & lex) // Find what key accent_2 is on - should // check about accent_1 also - std::map::iterator it = keymap_.begin(); - std::map::iterator end = keymap_.end(); + map::iterator it = keymap_.begin(); + map::iterator end = keymap_.end(); for (; it != end; ++it) { if (!it->second.empty() && it->second[0] == 0 @@ -288,7 +289,7 @@ int Trans::Load(LyXLex & lex) bool Trans::isAccentDefined(tex_accent accent, KmodInfo & i) const { - std::map::const_iterator cit = kmod_list_.find(accent); + map::const_iterator cit = kmod_list_.find(accent); if (cit != kmod_list_.end()) { i = cit->second; return true; diff --git a/src/undo_funcs.C b/src/undo_funcs.C index e0b0e42117..dfd8d81c46 100644 --- a/src/undo_funcs.C +++ b/src/undo_funcs.C @@ -28,6 +28,9 @@ #include #endif +using std::vector; + + /// the flag used by FinishUndo(); bool undo_finished; /// a flag @@ -149,7 +152,7 @@ bool textHandleUndo(BufferView * bv, Undo * undo) // now remove the old text if there is any #ifdef DELETE_UNUSED_PARAGRAPHS - std::vector vvpar; + vector vvpar; #endif if (before != behind || (!behind && !before)) { if (before) @@ -178,7 +181,7 @@ bool textHandleUndo(BufferView * bv, Undo * undo) } // put the new stuff in the list if there is one - if (tmppar3){ + if (tmppar3) { if (before) before->next(tmppar3); else @@ -232,7 +235,7 @@ bool textHandleUndo(BufferView * bv, Undo * undo) // which not always is true. bv->text->redoParagraphs(bv, bv->text->cursor, bv->text->cursor.par()); - if (tmppar){ + if (tmppar) { it = static_cast(tmppar->inInset()); LyXText * t; if (it) { @@ -265,7 +268,7 @@ bool textHandleUndo(BufferView * bv, Undo * undo) delete undo; #ifdef DELETE_UNUSED_PARAGRAPHS // And here it's save enough to delete all removed paragraphs - std::vector::iterator pit = vvpar.begin(); + vector::iterator pit = vvpar.begin(); if (pit != vvpar.end()) { lyxerr << "DEL: "; for(;pit != vvpar.end(); ++pit) { @@ -348,7 +351,7 @@ Undo * createUndo(BufferView * bv, Undo::undo_kind kind, // appear one by one when undoing. // EDIT is special since only layout information, not the // contents of a paragaph are stored. - if (!undo_finished && (kind != Undo::EDIT) && (kind != Undo::FINISH)){ + if (!undo_finished && (kind != Undo::EDIT) && (kind != Undo::FINISH)) { // check wether storing is needed if (!bv->buffer()->undostack.empty() && bv->buffer()->undostack.top()->kind == kind && diff --git a/src/vspace.C b/src/vspace.C index 103d3e9a40..c93722d99e 100644 --- a/src/vspace.C +++ b/src/vspace.C @@ -432,31 +432,46 @@ string const VSpace::asLatexCommand(BufferParams const & params) const int VSpace::inPixels(BufferView * bv) const { // Height of a normal line in pixels (zoom factor considered) - int default_height = bv->text->defaultHeight(); // [pixels] - int default_width = bv->workWidth(); + int const default_height = bv->text->defaultHeight(); // [pixels] + int retval = 0; + switch (kind_) { case NONE: - return 0; + // Value for this is already set + break; case DEFSKIP: - return bv->buffer()->params.getDefSkip().inPixels(bv); - + retval = bv->buffer()->params.getDefSkip().inPixels(bv); + break; + // This is how the skips are normally defined by // LateX. But there should be some way to change // this per document. case SMALLSKIP: - return default_height / 4; + retval = default_height / 4; + break; + case MEDSKIP: - return default_height / 2; + retval = default_height / 2; + break; + case BIGSKIP: - return default_height; + retval = default_height; + break; case VFILL: // leave space for the vfill symbol - return 3 * default_height; + retval = 3 * default_height; + break; + case LENGTH: - return len_.len().inPixels(default_width, default_height); + { + int const default_width = bv->workWidth(); + retval = len_.len().inPixels(default_width, default_height); + break; } - // we cannot go there, but there is a compiler warning... - return 0; + + } + + return retval; } -- 2.39.2