Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 10:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

interfaces: remove implicit conversion operators

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-05-28 09:57:50 +03:00
parent 58f74694c7
commit 463adcca11
4 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interfaces/ktexteditor/movingcursor.cpp
View file

@ -62,7 +62,7 @@ bool MovingCursor::atEndOfLine() const {
}
bool MovingCursor::atEndOfDocument() const {
return *this == document()->documentEnd();
return toCursor() == document()->documentEnd();
}
bool MovingCursor::atStartOfDocument() const {
@ -143,7 +143,7 @@ bool MovingCursor::move(int chars, WrapBehavior wrapBehavior)
}
}
if (c != *this) {
if (c != toCursor()) {
setPosition(c);
}
return true;

7
interfaces/ktexteditor/movingcursor.h
View file

@ -270,13 +270,6 @@ class KTEXTEDITOR_EXPORT MovingCursor
*/
const Cursor toCursor () const { return Cursor (line(), column()); }
/**
* Convert this clever cursor into a dumb one. Equal to toCursor, allowing to use implicit conversion.
* Even if this cursor belongs to a range, the created one not.
* @return normal cursor
*/
operator const Cursor () const { return Cursor (line(), column()); }
//
// operators for: MovingCursor <-> MovingCursor
//

13
interfaces/ktexteditor/movingrange.cpp
View file

@ -41,14 +41,15 @@ void MovingRange::setRange (const Cursor &start, const Cursor &end)
bool MovingRange::overlaps( const Range& range ) const
{
if (range.start() <= start())
return range.end() > start();
const Cursor startcursor = start().toCursor();
if (range.start() <= startcursor)
return range.end() > startcursor;
else if (range.end() >= end())
return range.start() < end();
const Cursor endcursor = end().toCursor();
if (range.end() >= endcursor)
return range.start() < endcursor;
else
return contains(range);
return contains(range);
}
// kate: space-indent on; indent-width 2; replace-tabs on;

10
interfaces/ktexteditor/movingrange.h
View file

@ -332,12 +332,6 @@ class KTEXTEDITOR_EXPORT MovingRange
*/
const Range toRange () const { return Range (start().toCursor(), end().toCursor()); }
/**
* Convert this clever range into a dumb one. Equal to toRange, allowing to use implicit conversion.
* @return normal range
*/
operator const Range () const { return Range (start().toCursor(), end().toCursor()); }
/**
* kDebug() stream operator. Writes this range to the debug output in a nicely formatted way.
* @param s debug stream
@ -387,7 +381,7 @@ class KTEXTEDITOR_EXPORT MovingRange
* \return \e true, if this range contains \e range, otherwise \e false
*/
inline bool contains(const Range& range) const {
return range.start() >= start() && range.end() <= end();
return range.start() >= start().toCursor() && range.end() <= end().toCursor();
}
/**
@ -398,7 +392,7 @@ class KTEXTEDITOR_EXPORT MovingRange
* \return \e true if the cursor is contained within this range, otherwise \e false.
*/
inline bool contains(const Cursor& cursor) const {
return cursor >= start() && cursor < end();
return cursor >= start().toCursor() && cursor < end().toCursor();
}
/**