GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-27 00:57:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Code Cleanup

Browse source 
- Removed unused util.cpp combine function.
This commit is contained in:
Paul Beckingham 2014-09-07 17:14:03 -04:00
parent 4aa79dccfa
commit bffc7a2ac8
3 changed files with 1 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/util.cpp
View file

@ -259,29 +259,6 @@ int flock (int fd, int operation)
} }
#endif #endif
////////////////////////////////////////////////////////////////////////////////
void combine (std::vector <int>& dest, const std::vector <int>& source)
{
// Create a map using the sequence elements as keys. This will create a
// unique list, with no duplicates.
std::map <int, int> both;
std::vector <int>::iterator i1;
for (i1 = dest.begin (); i1 != dest.end (); ++i1)
both[*i1] = 0;
std::vector <int>::const_iterator i2;
for (i2 = source.begin (); i2 != source.end (); ++i2)
both[*i2] = 0;
// Now make a sequence out of the keys of the map.
dest.clear ();
std::map <int, int>::iterator i3;
for (i3 = both.begin (); i3 != both.end (); ++i3)
dest.push_back (i3->first);
std::sort (dest.begin (), dest.end ());
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Run a binary with args, capturing output. // Run a binary with args, capturing output.
int execute ( int execute (

3
src/util.h
View file

@ -61,11 +61,8 @@ int execute (const std::string&, const std::vector <std::string>&, const std::st
int flock (int, int); int flock (int, int);
#endif #endif
void combine (std::vector <int>&, const std::vector <int>&);
const std::string encode (const std::string&); const std::string encode (const std::string&);
const std::string decode (const std::string&); const std::string decode (const std::string&);
const std::string escape (const std::string&, char); const std::string escape (const std::string&, char);
const std::vector<std::string> indentTree ( const std::vector<std::string> indentTree (

29
test/util.t.cpp
View file

@ -36,7 +36,7 @@ Context context;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int main (int argc, char** argv) int main (int argc, char** argv)
{ {
UnitTest t (40); UnitTest t (29);
// Ensure environment has no influence. // Ensure environment has no influence.
unsetenv ("TASKDATA"); unsetenv ("TASKDATA");
@ -89,33 +89,6 @@ int main (int argc, char** argv)
output = taskDifferences (right, rightAgain); output = taskDifferences (right, rightAgain);
t.ok (output.find ("No changes will be made") != std::string::npos, "No changes detected"); t.ok (output.find ("No changes will be made") != std::string::npos, "No changes detected");
// void combine (std::vector <int>&, const std::vector <int>&);
std::vector <int> vleft;
vleft.push_back (1);
vleft.push_back (2);
vleft.push_back (3);
std::vector <int> vright;
vright.push_back (4);
combine (vleft, vright);
t.is (vleft.size (), (size_t)4, "1,2,3 + 4 -> [4]");
t.is (vleft[0], 1, "1,2,3 + 4 -> 1,2,3,4");
t.is (vleft[1], 2, "1,2,3 + 4 -> 1,2,3,4");
t.is (vleft[2], 3, "1,2,3 + 4 -> 1,2,3,4");
t.is (vleft[3], 4, "1,2,3 + 4 -> 1,2,3,4");
vright.push_back (3);
vright.push_back (5);
combine (vleft, vright);
t.is (vleft.size (), (size_t)5, "1,2,3,4 + 3,4,5 -> [5]");
t.is (vleft[0], 1, "1,2,3,4 + 3,4,5 -> 1,2,3,4,5");
t.is (vleft[1], 2, "1,2,3,4 + 3,4,5 -> 1,2,3,4,5");
t.is (vleft[2], 3, "1,2,3,4 + 3,4,5 -> 1,2,3,4,5");
t.is (vleft[3], 4, "1,2,3,4 + 3,4,5 -> 1,2,3,4,5");
t.is (vleft[4], 5, "1,2,3,4 + 3,4,5 -> 1,2,3,4,5");
// see also indirect tests of indentProject and extractParents in `project.t'. // see also indirect tests of indentProject and extractParents in `project.t'.
// std::vector<std::string> indentTree (const std::vector<std::string>&, const std::string whitespace=" ", char delimiter='.'); // std::vector<std::string> indentTree (const std::vector<std::string>&, const std::string whitespace=" ", char delimiter='.');
std::vector <std::string> flat; std::vector <std::string> flat;