Commit bf36a604 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix some clazy warning

parent 8b6dd7fd
Pipeline #53472 failed with stage
in 28 minutes and 50 seconds
......@@ -22,7 +22,7 @@
#include <memory>
GoogleResourceMigrator::GoogleResourceMigrator()
: MigratorBase(QLatin1String("googleresourcemigrator"))
: MigratorBase(QStringLiteral("googleresourcemigrator"))
{
}
......@@ -294,7 +294,7 @@ QString GoogleResourceMigrator::mergeAccountNames(const ResourceValues<QString>
return {};
}
int GoogleResourceMigrator::mergeAccountIds(const ResourceValues<int> &accountId, const Instances &oldInstances) const
int GoogleResourceMigrator::mergeAccountIds(ResourceValues<int> accountId, const Instances &oldInstances) const
{
if (accountId.calendar > 0 && accountId.contacts > 0) {
if (accountId.calendar == accountId.contacts) {
......
......@@ -52,7 +52,7 @@ private:
Q_REQUIRED_RESULT bool migrateAccount(const QString &account, const Instances &oldInstances, const Akonadi::AgentInstance &newInstance);
void removeLegacyInstances(const QString &account, const Instances &instances);
Q_REQUIRED_RESULT QString mergeAccountNames(const ResourceValues<QString> &accountName, const Instances &oldInstances) const;
Q_REQUIRED_RESULT int mergeAccountIds(const ResourceValues<int> &accountId, const Instances &oldInstances) const;
Q_REQUIRED_RESULT int mergeAccountIds(ResourceValues<int> accountId, const Instances &oldInstances) const;
QMap<QString, Instances> mMigrations;
int mMigrationCount = 0;
......
......@@ -156,7 +156,6 @@ void UtEwsFakeSrvTest::simpleResponse()
const FakeEwsServer::DialogEntry::List dialog = {
{QStringLiteral("if (//test1/a = <a />) then (<b/>) else ()"), FakeEwsServer::DialogEntry::ReplyCallback(), QStringLiteral("Sample request 1")}};
QString receivedReq;
QScopedPointer<FakeEwsServer> srv(new FakeEwsServer(this));
srv->setDialog(dialog);
QVERIFY(srv->start());
......@@ -174,7 +173,6 @@ void UtEwsFakeSrvTest::callbackResponse()
},
QStringLiteral("Sample request 1")}};
QString receivedReq;
QScopedPointer<FakeEwsServer> srv(new FakeEwsServer(this));
srv->setDialog(dialog);
QVERIFY(srv->start());
......@@ -193,7 +191,6 @@ void UtEwsFakeSrvTest::multipleResponses()
FakeEwsServer::DialogEntry::ReplyCallback(),
QStringLiteral("Sample request 2")}};
QString receivedReq;
QScopedPointer<FakeEwsServer> srv(new FakeEwsServer(this));
srv->setDialog(dialog);
QVERIFY(srv->start());
......@@ -224,7 +221,6 @@ void UtEwsFakeSrvTest::emptyResponse()
},
QStringLiteral("Sample request 1")}};
QString receivedReq;
QScopedPointer<FakeEwsServer> srv(new FakeEwsServer(this));
srv->setDialog(dialog);
QVERIFY(srv->start());
......@@ -521,7 +517,6 @@ void UtEwsFakeSrvTest::getStreamingEventsRequest()
bool callbackCalled = false;
const FakeEwsServer::DialogEntry::List emptyDialog;
QString receivedReq;
QScopedPointer<FakeEwsServer> srv(new FakeEwsServer(this));
QVERIFY(srv->start());
QDateTime startTime = QDateTime::currentDateTime();
......@@ -641,7 +636,6 @@ void UtEwsFakeSrvTest::serverThread()
const FakeEwsServer::DialogEntry::List dialog = {
{QStringLiteral("if (//test1/a = <a />) then (<b/>) else ()"), FakeEwsServer::DialogEntry::ReplyCallback(), QStringLiteral("Sample request 1")}};
QString receivedReq;
FakeEwsServerThread thread;
thread.start();
QVERIFY(thread.waitServerStarted());
......@@ -666,7 +660,6 @@ void UtEwsFakeSrvTest::delayedContentSize()
const FakeEwsServer::DialogEntry::List dialog = {
{QStringLiteral("if (//test1/a = <a />) then (<b/>) else ()"), FakeEwsServer::DialogEntry::ReplyCallback(), QStringLiteral("Sample request 1")}};
QString receivedReq;
FakeEwsServerThread thread;
thread.start();
QVERIFY(thread.waitServerStarted());
......@@ -789,7 +782,6 @@ void UtEwsFakeSrvTest::xqueryResultsInCallback()
},
QStringLiteral("Sample request 1")}};
QString receivedReq;
QScopedPointer<FakeEwsServer> srv(new FakeEwsServer(this));
srv->setDialog(dialog);
QVERIFY(srv->start());
......
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