diff --git a/src/Context.h b/src/Context.h index bc82041c6..b44433a47 100644 --- a/src/Context.h +++ b/src/Context.h @@ -50,7 +50,6 @@ public: void initialize2 (int, char**); // all startup void initialize (); // for reinitializing int run (); // task classic - int interactive (); // task interactive (not implemented) int dispatch (std::string&); // command handler dispatch void shadow (); // shadow file update diff --git a/src/interactive.cpp b/src/interactive.cpp index b35f03a99..8c5d8c8fe 100644 --- a/src/interactive.cpp +++ b/src/interactive.cpp @@ -25,26 +25,14 @@ // //////////////////////////////////////////////////////////////////////////////// -//#include #include -//#include #include #include -//#include -//#include #include "Context.h" -//#include "text.h" -//#include "util.h" #include "main.h" #include "i18n.h" #include "../cmake.h" -//////////////////////////////////////////////////////////////////////////////// -int Context::interactive () -{ - return 0; -} - //////////////////////////////////////////////////////////////////////////////// int Context::getWidth () { diff --git a/src/main.cpp b/src/main.cpp index 047e194e2..d4db3f5dd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -64,29 +64,7 @@ int main (int argc, char** argv) try { context.initialize (argc, argv); - -/* From old 2.0.0 - std::string::size_type task = context.program.find ("/task"); - std::string::size_type t = context.program.find ("/t"); - std::string::size_type cal = context.program.find ("/cal"); - - if (context.program != "task" && - context.program != "t" && - context.program != "cal" && - (task == std::string::npos || context.program.length () != task + 5) && - (t == std::string::npos || context.program.length () != t + 2) && - (cal == std::string::npos || context.program.length () != cal + 4)) - status = context.handleInteractive (); - else - status = context.run (); -*/ - - std::string::size_type itask = context.program.find ("/itask"); - if (context.program == "itask" || - (itask != std::string::npos && context.program.length () == itask + 5)) - status = context.interactive (); - else - status = context.run (); + status = context.run (); } catch (std::string& error)