gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Code Cleanup

Browse Source 
- All objects now use the same convention for naming members.  The
  consistency is a good thing.
This commit is contained in:
Paul Beckingham
2011-08-25 21:54:28 -04:00
parent fb6dc5058f
commit dab06f8672
53 changed files with 1347 additions and 1349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/commands/CmdMerge.cpp
View File

@@ -63,7 +63,7 @@ int CmdMerge::execute (std::string& output)
Uri uri (file, "merge");
uri.parse();
if (uri.data.length ())
if (uri._data.length ())
{
Directory location (context.config.get ("data.location"));
@@ -73,14 +73,14 @@ int CmdMerge::execute (std::string& output)
Transport* transport;
if ((transport = Transport::getTransport (uri)) != NULL )
{
tmpfile = location.data + "/undo_remote.data";
tmpfile = location._data + "/undo_remote.data";
transport->recv (tmpfile);
delete transport;
file = tmpfile;
}
else
file = uri.path;
file = uri._path;
context.tdb.lock (context.config.getBoolean ("locking"));
context.tdb.merge (file);
@@ -91,10 +91,10 @@ int CmdMerge::execute (std::string& output)
if (tmpfile != "")
remove (tmpfile.c_str ());
if ( ((sAutopush == "ask") && (confirm ("Would you like to push the merged changes to \'" + uri.data + "\'?")) )
if ( ((sAutopush == "ask") && (confirm ("Would you like to push the merged changes to \'" + uri._data + "\'?")) )
|| (bAutopush) )
{
// context.task.set ("description", uri.data);
// context.task.set ("description", uri._data);
std::string out;
context.commands["push"]->execute (out);