diff --git a/src/commands/CMakeLists.txt b/src/commands/CMakeLists.txt index b10e17be..38ab0e30 100644 --- a/src/commands/CMakeLists.txt +++ b/src/commands/CMakeLists.txt @@ -17,7 +17,6 @@ set (commands_SRCS CmdCancel.cpp CmdGaps.cpp CmdGet.cpp CmdHelp.cpp - CmdImport.cpp CmdJoin.cpp CmdLengthen.cpp CmdMove.cpp diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp index 2cd6b741..305c15fa 100644 --- a/src/commands/CmdHelp.cpp +++ b/src/commands/CmdHelp.cpp @@ -89,7 +89,6 @@ int CmdHelpUsage () << " rc.=\n" << '\n'; - // TODO import // TODO undo // TODO List all extensions. @@ -521,8 +520,6 @@ int CmdHelp (const CLI& cli) << '\n' << '\n'; - // TODO import - // Ruler 1 2 3 4 5 6 7 8 // 12345678901234567890123456789012345678901234567890123456789012345678901234567890 else if (words[0] == "interval") diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp deleted file mode 100644 index ea6f534a..00000000 --- a/src/commands/CmdImport.cpp +++ /dev/null @@ -1,43 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Copyright 2015 - 2016, 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 -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. -// -// http://www.opensource.org/licenses/mit-license.php -// -//////////////////////////////////////////////////////////////////////////////// - -#include -#include - -//////////////////////////////////////////////////////////////////////////////// -int CmdImport () -{ - std::cout << "[import: import and merge JSON data]\n"; - - // TODO Load all data. - // TODO For each file. - // TODO Parse JSON. - // TODO Merge JSON and data. - - return 0; -} - -//////////////////////////////////////////////////////////////////////////////// diff --git a/src/commands/commands.h b/src/commands/commands.h index aa6e000c..25afb7fb 100644 --- a/src/commands/commands.h +++ b/src/commands/commands.h @@ -44,7 +44,6 @@ int CmdGaps (const CLI&, Rules&, Database& ); int CmdGet (const CLI&, Rules&, Database& ); int CmdHelpUsage ( ); int CmdHelp (const CLI& ); -int CmdImport ( ); int CmdJoin (const CLI&, Rules&, Database& ); int CmdLengthen (const CLI&, Rules&, Database& ); int CmdMove (const CLI&, Rules&, Database& ); diff --git a/src/init.cpp b/src/init.cpp index 71fe70e6..b35dad65 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -67,7 +67,6 @@ void initializeEntities (CLI& cli) cli.entity ("command", "gaps"); cli.entity ("command", "get"); cli.entity ("command", "help"); - cli.entity ("command", "import"); cli.entity ("command", "join"); cli.entity ("command", "lengthen"); cli.entity ("command", "move"); @@ -267,7 +266,6 @@ int dispatchCommand ( else if (command == "gaps") status = CmdGaps (cli, rules, database ); else if (command == "get") status = CmdGet (cli, rules, database ); else if (command == "help") status = CmdHelp (cli ); - else if (command == "import") status = CmdImport ( ); else if (command == "join") status = CmdJoin (cli, rules, database ); else if (command == "lengthen") status = CmdLengthen (cli, rules, database ); else if (command == "month") status = CmdChartMonth (cli, rules, database );