rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#5657 Removed serial key code from syntool

This commit is contained in:
Jerry (Xinyu Hou) 2016-10-13 11:20:43 +01:00
parent 4be9fc1800
commit 82e55702ef
4 changed files with 1 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/synergy/ArgParser.cpp
View File

@ -201,22 +201,6 @@ ArgParser::parseToolArgs(ToolArgs& args, int argc, const char* const* argv)
args.m_getArch = true; args.m_getArch = true;
return true; return true;
} }
else if (isArg(i, argc, argv, NULL, "--subscription-serial", 1)) {
args.m_subscriptionSerial = argv[++i];
if (args.m_subscriptionSerial.empty()) {
LOG((CLOG_CRIT "subscription error: serial was not provided"));
return false;
}
return true;
}
else if (isArg(i, argc, argv, NULL, "--get-subscription-filename", 0)) {
args.m_getSubscriptionFilename = true;
return true;
}
else if (isArg(i, argc, argv, NULL, "--check-subscription", 0)) {
args.m_checkSubscription = true;
return true;
}
else if (isArg(i, argc, argv, NULL, "--notify-activation", 0)) { else if (isArg(i, argc, argv, NULL, "--notify-activation", 0)) {
args.m_notifyActivation = true; args.m_notifyActivation = true;
return true; return true;

30
src/lib/synergy/ToolApp.cpp
View File

@ -81,36 +81,6 @@ ToolApp::run(int argc, char** argv)
else if (m_args.m_getArch) { else if (m_args.m_getArch) {
std::cout << ARCH->getPlatformName() << std::endl; std::cout << ARCH->getPlatformName() << std::endl;
} }
else if (!m_args.m_subscriptionSerial.empty()) {
try {
SubscriptionManager subscriptionManager;
subscriptionManager.activate(m_args.m_subscriptionSerial);
}
catch (XSubscription& e) {
LOG((CLOG_CRIT "subscription error: %s", e.what()));
return kExitSubscription;
}
}
else if (m_args.m_getSubscriptionFilename) {
try {
SubscriptionManager subscriptionManager;
subscriptionManager.printFilename();
}
catch (XSubscription& e) {
LOG((CLOG_CRIT "subscription error: %s", e.what()));
return kExitSubscription;
}
}
else if (m_args.m_checkSubscription) {
try {
SubscriptionManager subscriptionManager;
subscriptionManager.checkFile("");
}
catch (XSubscription& e) {
LOG((CLOG_CRIT "subscription error: %s", e.what()));
return kExitSubscription;
}
}
else if (m_args.m_notifyActivation) { else if (m_args.m_notifyActivation) {
notifyActivation(); notifyActivation();
} }

5
src/lib/synergy/ToolArgs.cpp
View File

@ -23,9 +23,6 @@ ToolArgs::ToolArgs() :
m_getInstalledDir(false), m_getInstalledDir(false),
m_getProfileDir(false), m_getProfileDir(false),
m_getArch(false), m_getArch(false),
m_getSubscriptionFilename(false), m_notifyActivation(false)
m_checkSubscription(false),
m_notifyActivation(false),
m_subscriptionSerial()
{ {
} }

3
src/lib/synergy/ToolArgs.h
View File

@ -29,8 +29,5 @@ public:
bool m_getInstalledDir; bool m_getInstalledDir;
bool m_getProfileDir; bool m_getProfileDir;
bool m_getArch; bool m_getArch;
bool m_getSubscriptionFilename;
bool m_checkSubscription;
bool m_notifyActivation; bool m_notifyActivation;
String m_subscriptionSerial;
}; };