From 4ad759dbc4c3bd7b8baeabfd44daa6d151289a8e Mon Sep 17 00:00:00 2001 From: Alfredo Braunstein Date: Wed, 7 Jan 2004 06:48:30 +0000 Subject: [PATCH] use max & min git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8310 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 6 ++++++ src/lyxcursor.C | 7 +++++++ src/lyxcursor.h | 2 ++ src/textcursor.C | 5 +++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4f7aa40a40..dda43c6bb8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ + +2004-01-07 Alfredo Braunstein + + * lyxcursor.[Ch] (operator>): add + * textcursor.C (selStart, selEnd): use std::min and std::max + 2004-01-06 Lars Gullik Bjonnes * Chktex.C: include boost/format.hpp diff --git a/src/lyxcursor.C b/src/lyxcursor.C index 137ea2bccd..66b063da2a 100644 --- a/src/lyxcursor.C +++ b/src/lyxcursor.C @@ -76,3 +76,10 @@ bool operator<(LyXCursor const & a, LyXCursor const & b) return (a.par() < b.par() || (a.par() == b.par() && a.pos() < b.pos())); } + + +bool operator>(LyXCursor const & a, LyXCursor const & b) +{ + return (a.par() > b.par() || + (a.par() == b.par() && a.pos() > b.pos())); +} diff --git a/src/lyxcursor.h b/src/lyxcursor.h index 6ae0f4e97c..f27c0db105 100644 --- a/src/lyxcursor.h +++ b/src/lyxcursor.h @@ -71,5 +71,7 @@ bool operator==(LyXCursor const & a, LyXCursor const & b); bool operator!=(LyXCursor const & a, LyXCursor const & b); /// bool operator<(LyXCursor const & a, LyXCursor const & b); +/// +bool operator>(LyXCursor const & a, LyXCursor const & b); #endif // LYXCURSOR_H diff --git a/src/textcursor.C b/src/textcursor.C index 275441471f..a372f3fd50 100644 --- a/src/textcursor.C +++ b/src/textcursor.C @@ -9,6 +9,7 @@ */ #include +#include #include "textcursor.h" @@ -17,7 +18,7 @@ LyXCursor const & TextCursor::selStart() const { if (!selection.set()) return cursor; - return selection.cursor < cursor ? selection.cursor : cursor; + return std::min(selection.cursor, cursor); } @@ -25,7 +26,7 @@ LyXCursor const & TextCursor::selEnd() const { if (!selection.set()) return cursor; - return selection.cursor < cursor ? cursor : selection.cursor; + return std::max(selection.cursor, cursor); } -- 2.39.2