#5707 Prefer 'update' over 'upgrade'

src/gui/src/ActivationNotifier.cpp

@@ -29,7 +29,7 @@ void ActivationNotifier::setIdentity(QString identity)
 	m_Identity = identity;
 }
 
-void ActivationNotifier::setUpgradeInfo(QString const& fromVersion,
+void ActivationNotifier::setUpdateInfo(QString const& fromVersion,
 										QString const& toVersion,
 										QString const& serialKey)
 {
@@ -49,7 +49,7 @@ void ActivationNotifier::notify()
 	}
 }
 
-void ActivationNotifier::notifyUpgrade()
+void ActivationNotifier::notifyUpdate()
 {
 	try {
 		CoreInterface coreInterface;

src/gui/src/ActivationNotifier.h

@@ -27,12 +27,12 @@ public:
 	explicit ActivationNotifier(QObject *parent = 0);
 
 	void setIdentity(QString identity);
-	void setUpgradeInfo(QString const& fromVersion,
+	void setUpdateInfo(QString const& fromVersion,
 						QString const& toVersion, QString const& serialKey);
 
 public slots:
 	void notify();
-	void notifyUpgrade();
+	void notifyUpdate();
 
 signals:
 	void finished();

src/gui/src/CoreInterface.cpp

@@ -65,7 +65,7 @@ QString CoreInterface::getSerialKeyFilePath()
 QString CoreInterface::notifyUpdate (QString const& fromVersion,
 									  QString const& toVersion,
 									  QString const& serialKey) {
-	QStringList args("--notify-upgrade");
+	QStringList args("--notify-update");
 	QString input(fromVersion + ":" + toVersion + ":" + serialKey);
 	return run(args, input);
 }

src/gui/src/LicenseManager.cpp

@@ -74,7 +74,7 @@ LicenseManager::setSerialKey(QString serialKeyString, bool acceptExpired)
 void
 LicenseManager::notifyUpdate(QString fromVersion, QString toVersion) {
 	ActivationNotifier* notifier = new ActivationNotifier();
-	notifier->setUpgradeInfo (fromVersion, toVersion,
+	notifier->setUpdateInfo (fromVersion, toVersion,
 							QString::fromStdString(m_serialKey.toString()));
 
 	QThread* thread = new QThread();
@@ -85,7 +85,7 @@ LicenseManager::notifyUpdate(QString fromVersion, QString toVersion) {
 	notifier->moveToThread(thread);
 	thread->start();
 
-	QMetaObject::invokeMethod(notifier, "notifyUpgrade",
+	QMetaObject::invokeMethod(notifier, "notifyUpdate",
 							  Qt::QueuedConnection);
 }
 

src/lib/synergy/ArgParser.cpp

@@ -208,8 +208,8 @@ ArgParser::parseToolArgs(ToolArgs& args, int argc, const char* const* argv)
 			args.m_notifyActivation = true;
 			return true;
 		}
-		else if (isArg(i, argc, argv, NULL, "--notify-upgrade", 0)) {
+		else if (isArg(i, argc, argv, NULL, "--notify-update", 0)) {
-			args.m_notifyUpgrade = true;
+			args.m_notifyUpdate = true;
 			return true;
 		}
 		else {

src/lib/synergy/ToolApp.cpp

@@ -80,8 +80,8 @@ ToolApp::run(int argc, char** argv)
 		else if (m_args.m_getArch) {
 			std::cout << ARCH->getPlatformName() << std::endl;
 		}
-		else if (m_args.m_notifyUpgrade) {
+		else if (m_args.m_notifyUpdate) {
-			notifyUpgrade();
+			notifyUpdate();
 		}
 		else if (m_args.m_notifyActivation) {
 			notifyActivation();
@@ -138,7 +138,7 @@ ToolApp::loginAuth()
 }
 
 void
-ToolApp::notifyUpgrade()
+ToolApp::notifyUpdate()
 {
 	String data;
 	std::cin >> data;

src/lib/synergy/ToolApp.h

@@ -30,7 +30,7 @@ public:
 private:
 	void				loginAuth();
 	void				notifyActivation();
-	void                notifyUpgrade();
+	void                notifyUpdate();
 
 private:
 	ToolArgs			m_args;

src/lib/synergy/ToolArgs.cpp

@@ -24,6 +24,6 @@ ToolArgs::ToolArgs() :
 	m_getProfileDir(false),
 	m_getArch(false),
 	m_notifyActivation(false),
-	m_notifyUpgrade(false)
+	m_notifyUpdate(false)
 {
 }

src/lib/synergy/ToolArgs.h

@@ -30,5 +30,5 @@ public:
 	bool				m_getProfileDir;
 	bool				m_getArch;
 	bool				m_notifyActivation;
-	bool                m_notifyUpgrade;
+	bool                m_notifyUpdate;
 };