Commit 253bb028 authored by Daniel Vrátil's avatar Daniel Vrátil 🤖
Browse files

Fix Windows build

parent 34fdee06
...@@ -124,7 +124,7 @@ bool AkonadiServer::init() ...@@ -124,7 +124,7 @@ bool AkonadiServer::init()
} }
// Create local servers and start listening // Create local servers and start listening
if (!createServers(connectionSettings)) { if (!createServers(settings, connectionSettings)) {
quit(); quit();
return false; return false;
} }
...@@ -348,7 +348,7 @@ void AkonadiServer::stopDatabaseProcess() ...@@ -348,7 +348,7 @@ void AkonadiServer::stopDatabaseProcess()
DbConfig::configuredDatabase()->stopInternalServer(); DbConfig::configuredDatabase()->stopInternalServer();
} }
bool AkonadiServer::createServers(QSettings &connectionSettings) bool AkonadiServer::createServers(QSettings &settings, QSettings &connectionSettings)
{ {
mCmdServer = std::make_unique<AkLocalServer>(this); mCmdServer = std::make_unique<AkLocalServer>(this);
connect(mCmdServer.get(), QOverload<quintptr>::of(&AkLocalServer::newConnection), this, &AkonadiServer::newCmdConnection); connect(mCmdServer.get(), QOverload<quintptr>::of(&AkLocalServer::newConnection), this, &AkonadiServer::newCmdConnection);
...@@ -387,6 +387,8 @@ bool AkonadiServer::createServers(QSettings &connectionSettings) ...@@ -387,6 +387,8 @@ bool AkonadiServer::createServers(QSettings &connectionSettings)
connectionSettings.setValue(QStringLiteral("Notifications/Method"), QStringLiteral("NamedPipe")); connectionSettings.setValue(QStringLiteral("Notifications/Method"), QStringLiteral("NamedPipe"));
connectionSettings.setValue(QStringLiteral("Notifications/NamedPipe"), ntfPipe); connectionSettings.setValue(QStringLiteral("Notifications/NamedPipe"), ntfPipe);
#else #else
Q_UNUSED(settings);
const QString cmdSocketName = QStringLiteral("akonadiserver-cmd.socket"); const QString cmdSocketName = QStringLiteral("akonadiserver-cmd.socket");
const QString ntfSocketName = QStringLiteral("akonadiserver-ntf.socket"); const QString ntfSocketName = QStringLiteral("akonadiserver-ntf.socket");
const QString socketDir = Utils::preferredSocketDirectory(StandardDirs::saveDir("data"), const QString socketDir = Utils::preferredSocketDirectory(StandardDirs::saveDir("data"),
......
...@@ -112,7 +112,7 @@ private: ...@@ -112,7 +112,7 @@ private:
bool startDatabaseProcess(); bool startDatabaseProcess();
bool createDatabase(); bool createDatabase();
void stopDatabaseProcess(); void stopDatabaseProcess();
bool createServers(QSettings &connectionSettings); bool createServers(QSettings &settings, QSettings &connectionSettings);
bool setupDatabase(); bool setupDatabase();
uint userId() const; uint userId() const;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment