GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-07-07 20:06:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename Range::overlap to Range::overlaps

Browse source
This commit is contained in:
Thomas Lauf 2018-09-18 20:15:15 +02:00
parent c48063dec7
commit 9e1e604108
7 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/data.cpp
View file

@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
//
// Copyright 2015 - 2016, Paul Beckingham, Federico Hernandez.
// Copyright 2015 - 2018, Thomas Lauf, Paul Beckingham, Federico Hernandez.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@ -429,7 +429,7 @@ std::vector <Range> merge (
int merges = 0;
for (unsigned int i = 0; i < sorted.size (); ++i)
{
if (cursor && sorted[cursor - 1].overlap (sorted[i]))
if (cursor && sorted[cursor - 1].overlaps (sorted[i]))
{
sorted[cursor - 1] = sorted[cursor - 1].combine (sorted[i]);
++merges;
@ -457,11 +457,11 @@ std::vector <Range> addRanges (
std::vector <Range> results;
for (auto& range : ranges)
if (limits.overlap (range))
if (limits.overlaps (range))
results.push_back (range);
for (auto& addition : additions)
if (limits.overlap (addition))
if (limits.overlaps (addition))
results.push_back (addition);
return results;