Code Cleanup

- Removed unused util.cpp encode and decode functions.
This commit is contained in:
Paul Beckingham 2014-09-07 17:25:47 -04:00
parent a7171193ca
commit 66bb5b3906
4 changed files with 3 additions and 52 deletions

View file

@ -325,53 +325,6 @@ int execute (
// Collides with std::numeric_limits methods
#undef max
////////////////////////////////////////////////////////////////////////////////
// Encode values prior to serialization.
// [ -> &open;
// ] -> &close;
const std::string encode (const std::string& value)
{
std::string modified = value;
str_replace (modified, "[", "&open;");
str_replace (modified, "]", "&close;");
return modified;
}
////////////////////////////////////////////////////////////////////////////////
// Decode values after parse.
// " <- &dquot;
// ' <- &squot; or &quot;
// , <- &comma;
// [ <- &open;
// ] <- &close;
// : <- &colon;
const std::string decode (const std::string& value)
{
if (value.find ('&') != std::string::npos)
{
std::string modified = value;
// Supported encodings.
str_replace (modified, "&open;", "[");
str_replace (modified, "&close;", "]");
// Support for deprecated encodings. These cannot be removed or old files
// will not be parsable. Not just old files - completed.data can contain
// tasks formatted/encoded using these.
str_replace (modified, "&dquot;", "\"");
str_replace (modified, "&quot;", "'");
str_replace (modified, "&squot;", "'"); // Deprecated 2.0
str_replace (modified, "&comma;", ","); // Deprecated 2.0
str_replace (modified, "&colon;", ":"); // Deprecated 2.0
return modified;
}
return value;
}
////////////////////////////////////////////////////////////////////////////////
// Escapes any unescaped character of type c within the given string
// e.g. ' ' -> '\ '

View file

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

View file

@ -150,6 +150,9 @@ TODO Task::getDependencies
TODO Task::urgency
TODO Task::encode
TODO Task::decode
*/
// Task::operator==

View file

@ -112,9 +112,6 @@ int main (int argc, char** argv)
t.is (indentProject ("one.two"), " two", "indentProject 'one.two' -> ' two'");
t.is (indentProject ("one.two.three"), " three", "indentProject 'one.two.three' -> ' three'");
// TODO const std::string encode (const std::string& value);
// TODO const std::string decode (const std::string& value);
return 0;
}