port to QtService 2.0.0

Author: Skycoder42

src/datasyncandroid/androidbackgroundservice.cpp

@@ -49,7 +49,7 @@ void AndroidBackgroundService::prepareSetup(Setup &setup)
 
 QtService::Service::CommandResult AndroidBackgroundService::onStart()
 {
-	return OperationCompleted;
+	return CommandResult::Completed;
 }
 
 QtService::Service::CommandResult AndroidBackgroundService::onStop(int &exitCode)
@@ -61,7 +61,7 @@ QtService::Service::CommandResult AndroidBackgroundService::onStop(int &exitCode
 
 	Setup::removeSetup(setupName(), true); //TODO make optional (rmwait, rmnowait, norm)
 	exitCode = EXIT_SUCCESS;
-	return OperationCompleted;
+	return CommandResult::Completed;
 }
 
 void AndroidBackgroundService::onSyncCompleted(SyncManager::SyncState state)

tests/auto/datasync/IntegrationTest/tst_integration.cpp

@@ -27,15 +27,15 @@ private Q_SLOTS:
 	void unlock();
 
 private:
-	QtService::ServiceControl *server;
+	QtService::ServiceControl *server = nullptr;
 
-	AccountManager *acc1;
-	SyncManager *sync1;
-	DataTypeStore<TestData> *store1;
+	AccountManager *acc1 = nullptr;
+	SyncManager *sync1 = nullptr;
+	DataTypeStore<TestData> *store1 = nullptr;
 
-	AccountManager *acc2;
-	SyncManager *sync2;
-	DataTypeStore<TestData> *store2;
+	AccountManager *acc2 = nullptr;
+	SyncManager *sync2 = nullptr;
+	DataTypeStore<TestData> *store2 = nullptr;
 
 	QUuid dev2Id;
 };
@@ -136,7 +136,7 @@ void IntegrationTest::cleanupTestCase()
 	Setup::removeSetup(QStringLiteral("setup2"), true);
 
 	QVERIFY(server->stop());
-	QTRY_COMPARE(server->status(), QtService::ServiceControl::ServiceStopped);
+	QTRY_COMPARE(server->status(), QtService::ServiceControl::Status::Stopped);
 	server->deleteLater();
 }
 

tests/auto/datasync/TestAppServer/tst_appserver.cpp

@@ -96,15 +96,15 @@ private Q_SLOTS:
 private:
 	QtService::ServiceControl *server;
 
-	MockClient *client;
+	MockClient *client = nullptr;
 	QString devName;
 	QUuid devId;
-	ClientCrypto *crypto;
+	ClientCrypto *crypto = nullptr;
 
-	MockClient *partner;
+	MockClient *partner = nullptr;
 	QString partnerName;
 	QUuid partnerDevId;
-	ClientCrypto *partnerCrypto;
+	ClientCrypto *partnerCrypto = nullptr;
 
 	void testAddDevice(MockClient *&partner, QUuid &partnerDevId, bool keepPartner = false);
 
@@ -162,19 +162,19 @@ void TestAppServer::cleanupTestCase()
 {
 	clean();
 	clean(partner);
-	if(server->status() == QtService::ServiceControl::ServiceRunning) {
+	if(server->status() == QtService::ServiceControl::Status::Running) {
 		QVERIFY(server->stop());
-		QTRY_COMPARE(server->status(), QtService::ServiceControl::ServiceStopped);
+		QTRY_COMPARE(server->status(), QtService::ServiceControl::Status::Stopped);
 	}
 	server->deleteLater();
 }
 
 void TestAppServer::testStart()
 {
 	QVERIFY(server->start());
-	QTRY_COMPARE(server->status(), QtService::ServiceControl::ServiceRunning);
+	QTRY_COMPARE(server->status(), QtService::ServiceControl::Status::Running);
 	QEXPECT_FAIL("", "Server should not stop easily", Continue);
-	QTRY_COMPARE(server->status(), QtService::ServiceControl::ServiceStopped);
+	QTRY_COMPARE(server->status(), QtService::ServiceControl::Status::Stopped);
 }
 
 void TestAppServer::testInvalidVersion()
@@ -1824,7 +1824,7 @@ void TestAppServer::testRemoveSelf()
 void TestAppServer::testStop()
 {
 	server->stop();
-	QTRY_COMPARE(server->status(), QtService::ServiceControl::ServiceStopped);
+	QTRY_COMPARE(server->status(), QtService::ServiceControl::Status::Stopped);
 }
 
 void TestAppServer::clean(bool disconnect)

tests/auto/datasync/TestLib/mockconnection.cpp

@@ -48,7 +48,8 @@ void MockConnection::sendPing()
 
 void MockConnection::close()
 {
-	_socket->close();
+	if(_socket)
+		_socket->close();
 }
 
 bool MockConnection::waitForNothing()

tools/appserver/datasyncservice.cpp

@@ -50,7 +50,7 @@ QtService::Service::CommandResult DatasyncService::onStart()
 	auto configPath = findConfig();
 	if(configPath.isEmpty()) {
 		qCritical() << "Unable to find any configuration file. Set it explicitly via the QDSAPP_CONFIG_FILE environment variable";
-		return OperationFailed;
+		return CommandResult::Failed;
 	}
 
 	_config = new QSettings(configPath, QSettings::IniFormat, this);
@@ -59,7 +59,7 @@ QtService::Service::CommandResult DatasyncService::onStart()
 					<< configPath
 					<< "with error:"
 					<< (_config->status() == QSettings::AccessError ? "Access denied" : "Invalid format");
-		return OperationFailed;
+		return CommandResult::Failed;
 	}
 
 	//before anything else: set the log level
@@ -77,11 +77,11 @@ QtService::Service::CommandResult DatasyncService::onStart()
 			Qt::QueuedConnection);
 
 	if(!_connector->setupWss())
-		return OperationFailed;
+		return CommandResult::Failed;
 	_database->initialize();
 
 	qDebug() << QCoreApplication::applicationName() << "started successfully";
-	return OperationPending;
+	return CommandResult::Pending;
 }
 
 QtService::Service::CommandResult DatasyncService::onStop(int &exitCode)
@@ -92,7 +92,7 @@ QtService::Service::CommandResult DatasyncService::onStop(int &exitCode)
 	_mainPool->waitForDone();
 	exitCode = EXIT_SUCCESS;
 	qDebug() << "Server stopped";
-	return OperationCompleted;
+	return CommandResult::Completed;
 }
 
 QtService::Service::CommandResult DatasyncService::onReload()
@@ -105,7 +105,7 @@ QtService::Service::CommandResult DatasyncService::onReload()
 					<< "with error:"
 					<< (_config->status() == QSettings::AccessError ? "Access denied" : "Invalid format");
 		qCritical() << "Reload failed. Configuration has not been reloaded!";
-		return OperationFailed;
+		return CommandResult::Failed;
 	}
 
 	// before anything else: set the log level
@@ -119,25 +119,25 @@ QtService::Service::CommandResult DatasyncService::onReload()
 	_connector->recreateServer();
 	if(!_connector->setupWss() ||
 	   !_connector->listen()) {
-		return OperationFailed;
+		return CommandResult::Failed;
 	}
 
 	qDebug() << QCoreApplication::applicationName() << "completed reloading";
-	return OperationCompleted;
+	return CommandResult::Completed;
 }
 
 QtService::Service::CommandResult DatasyncService::onPause()
 {
 	qDebug() << "Pausing server...";
 	_connector->setPaused(true);
-	return OperationCompleted;
+	return CommandResult::Completed;
 }
 
 QtService::Service::CommandResult DatasyncService::onResume()
 {
 	qDebug() << "Resuming server...";
 	_connector->setPaused(false);
-	return OperationCompleted;
+	return CommandResult::Completed;
 }
 
 void DatasyncService::completeStartup(bool ok)