diff --git a/src/contacts/contactsservice.cpp b/src/contacts/contactsservice.cpp --- a/src/contacts/contactsservice.cpp +++ b/src/contacts/contactsservice.cpp @@ -21,6 +21,7 @@ #include "contactsservice.h" #include "contact.h" #include "contactsgroup.h" +#include "utils.h" #include "../debug.h" #include @@ -719,8 +720,7 @@ QString proto = key.mid(10); proto.chop(4); bool primary = (contact->custom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-IMAddress")) == value); - output.append(im_str.arg(value, Contact::IMProtocolNameToScheme(proto), - (primary ? QStringLiteral("true") : QStringLiteral("false"))).toUtf8()); + output.append(im_str.arg(value, Contact::IMProtocolNameToScheme(proto), Utils::bool2Str(primary)).toUtf8()); parsedCustoms << key; /* X-messaging is probably a new key (?) used by KAddressbook when importing * contacts from vCard. */ diff --git a/src/core/job.cpp b/src/core/job.cpp --- a/src/core/job.cpp +++ b/src/core/job.cpp @@ -26,6 +26,7 @@ #include "networkaccessmanagerfactory_p.h" #include "../debug.h" #include "authjob.h" +#include "utils.h" #include #include @@ -335,7 +336,7 @@ } if (!standardParamQuery.hasQueryItem(Job::StandardParams::PrettyPrint)) { - standardParamQuery.addQueryItem(Job::StandardParams::PrettyPrint, prettyPrint ? QStringLiteral("true") : QStringLiteral("false")); + standardParamQuery.addQueryItem(Job::StandardParams::PrettyPrint, Utils::bool2Str(prettyPrint)); } url.setQuery(standardParamQuery); diff --git a/src/drive/changefetchjob.cpp b/src/drive/changefetchjob.cpp --- a/src/drive/changefetchjob.cpp +++ b/src/drive/changefetchjob.cpp @@ -176,14 +176,14 @@ if (d->startChangeId > 0) { query.addQueryItem(QStringLiteral("startChangeId"), QString::number(d->startChangeId)); } - query.addQueryItem(QStringLiteral("includeItemsFromAllDrives"), d->includeItemsFromAllDrives ? QStringLiteral("true") : QStringLiteral("false")); + query.addQueryItem(QStringLiteral("includeItemsFromAllDrives"), Utils::bool2Str(d->includeItemsFromAllDrives)); url.setQuery(query); } else { url = DriveService::fetchChangeUrl(d->changeId); } QUrlQuery query(url); - query.addQueryItem(QStringLiteral("supportsAllDrives"), d->supportsAllDrives ? QStringLiteral("true") : QStringLiteral("false")); + query.addQueryItem(QStringLiteral("supportsAllDrives"), Utils::bool2Str(d->supportsAllDrives)); url.setQuery(query); QNetworkRequest request(url); diff --git a/src/drive/childreferencecreatejob.cpp b/src/drive/childreferencecreatejob.cpp --- a/src/drive/childreferencecreatejob.cpp +++ b/src/drive/childreferencecreatejob.cpp @@ -65,7 +65,7 @@ QUrl url = DriveService::createChildReference(folderId); QUrlQuery withDriveSupportQuery(url); - withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), supportsAllDrives ? QStringLiteral("true") : QStringLiteral("false")); + withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), Utils::bool2Str(supportsAllDrives)); url.setQuery(withDriveSupportQuery); QNetworkRequest request(url); diff --git a/src/drive/drivesfetchjob.cpp b/src/drive/drivesfetchjob.cpp --- a/src/drive/drivesfetchjob.cpp +++ b/src/drive/drivesfetchjob.cpp @@ -34,8 +34,6 @@ namespace { static const QString MaxResultsAttr = QStringLiteral("maxResults"); static const QString UseDomainAdminAccessAttr = QStringLiteral("useDomainAdminAccess"); - static const QString True = QStringLiteral("true"); - static const QString False = QStringLiteral("false"); } using namespace KGAPI2; using namespace KGAPI2::Drive; @@ -195,7 +193,7 @@ query.addQueryItem(MaxResultsAttr, QString::number(d->maxResults)); } if (!d->useDomainAdminAccess.isNull()) { - query.addQueryItem(UseDomainAdminAccessAttr, d->useDomainAdminAccess.toBool() ? True : False); + query.addQueryItem(UseDomainAdminAccessAttr, Utils::bool2Str(d->useDomainAdminAccess.toBool())); } if (!d->searchQuery.isEmpty()) { query.addQueryItem(QStringLiteral("q"), d->searchQuery.serialize()); diff --git a/src/drive/drivesmodifyjob.cpp b/src/drive/drivesmodifyjob.cpp --- a/src/drive/drivesmodifyjob.cpp +++ b/src/drive/drivesmodifyjob.cpp @@ -35,8 +35,6 @@ namespace { static const QString UseDomainAdminAccessAttr = QStringLiteral("useDomainAdminAccess"); - static const QString True = QStringLiteral("true"); - static const QString False = QStringLiteral("false"); } using namespace KGAPI2; using namespace KGAPI2::Drive; @@ -87,7 +85,7 @@ QUrlQuery query(url); if (useDomainAdminAccess != false) { - query.addQueryItem(UseDomainAdminAccessAttr, useDomainAdminAccess ? True : False); + query.addQueryItem(UseDomainAdminAccessAttr, Utils::bool2Str(useDomainAdminAccess)); } url.setQuery(query); diff --git a/src/drive/drivessearchquery.cpp b/src/drive/drivessearchquery.cpp --- a/src/drive/drivessearchquery.cpp +++ b/src/drive/drivessearchquery.cpp @@ -19,6 +19,7 @@ */ #include "drivessearchquery.h" +#include "utils.h" #include #include @@ -52,7 +53,7 @@ case Name: return QStringLiteral("'%1'").arg(var.toString().replace(QLatin1Char('\''), QLatin1String("\\\'"))); case Hidden: - return (var.toBool() == true ? QStringLiteral("true") : QStringLiteral("false")); + return Utils::bool2Str(var.toBool()); case MemberCount: case OrganizerCount: return var.toString(); diff --git a/src/drive/fileabstractmodifyjob.cpp b/src/drive/fileabstractmodifyjob.cpp --- a/src/drive/fileabstractmodifyjob.cpp +++ b/src/drive/fileabstractmodifyjob.cpp @@ -65,7 +65,7 @@ QUrl url = q->url(fileId); QUrlQuery query(url); - query.addQueryItem(QStringLiteral("supportsAllDrives"), supportsAllDrives ? QStringLiteral("true") : QStringLiteral("false")); + query.addQueryItem(QStringLiteral("supportsAllDrives"), Utils::bool2Str(supportsAllDrives)); url.setQuery(query); QNetworkRequest request(url); diff --git a/src/drive/filefetchjob.cpp b/src/drive/filefetchjob.cpp --- a/src/drive/filefetchjob.cpp +++ b/src/drive/filefetchjob.cpp @@ -76,7 +76,7 @@ query.addQueryItem(QStringLiteral("q"), searchQuery.serialize()); } - query.addQueryItem(QStringLiteral("includeItemsFromAllDrives"), includeItemsFromAllDrives ? QStringLiteral("true") : QStringLiteral("false")); + query.addQueryItem(QStringLiteral("includeItemsFromAllDrives"), Utils::bool2Str(includeItemsFromAllDrives)); url.setQuery(query); @@ -115,7 +115,7 @@ } QUrlQuery withDriveSupportQuery(url); - withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), supportsAllDrives ? QStringLiteral("true") : QStringLiteral("false")); + withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), Utils::bool2Str(supportsAllDrives)); url.setQuery(withDriveSupportQuery); QNetworkRequest request(url); diff --git a/src/drive/filesearchquery.cpp b/src/drive/filesearchquery.cpp --- a/src/drive/filesearchquery.cpp +++ b/src/drive/filesearchquery.cpp @@ -20,6 +20,7 @@ */ #include "filesearchquery.h" +#include "utils.h" #include #include @@ -78,7 +79,7 @@ case Trashed: case Starred: case SharedWithMe: - return (var.toBool() == true ? QStringLiteral("true") : QStringLiteral("false")); + return Utils::bool2Str(var.toBool()); } Q_ASSERT(false); diff --git a/src/drive/parentreferencecreatejob.cpp b/src/drive/parentreferencecreatejob.cpp --- a/src/drive/parentreferencecreatejob.cpp +++ b/src/drive/parentreferencecreatejob.cpp @@ -65,7 +65,7 @@ QUrl url = DriveService::createParentReferenceUrl(fileId); QUrlQuery withDriveSupportQuery(url); - withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), supportsAllDrives ? QStringLiteral("true") : QStringLiteral("false")); + withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), Utils::bool2Str(supportsAllDrives)); url.setQuery(withDriveSupportQuery); QNetworkRequest request(url); diff --git a/src/drive/permissioncreatejob.cpp b/src/drive/permissioncreatejob.cpp --- a/src/drive/permissioncreatejob.cpp +++ b/src/drive/permissioncreatejob.cpp @@ -66,7 +66,7 @@ QUrl url = DriveService::createPermissionUrl(fileId); QUrlQuery withDriveSupportQuery(url); - withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), supportsAllDrives ? QStringLiteral("true") : QStringLiteral("false")); + withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), Utils::bool2Str(supportsAllDrives)); url.setQuery(withDriveSupportQuery); QNetworkRequest request(url); diff --git a/src/drive/permissiondeletejob.cpp b/src/drive/permissiondeletejob.cpp --- a/src/drive/permissiondeletejob.cpp +++ b/src/drive/permissiondeletejob.cpp @@ -24,6 +24,7 @@ #include "permissiondeletejob.h" #include "permission.h" #include "account.h" +#include "utils.h" #include "driveservice.h" #include @@ -115,7 +116,7 @@ const QString permissionId = d->permissionsIds.takeFirst(); QUrl url = DriveService::deletePermissionUrl(d->fileId, permissionId); QUrlQuery withDriveSupportQuery(url); - withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), d->supportsAllDrives ? QStringLiteral("true") : QStringLiteral("false")); + withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), Utils::bool2Str(d->supportsAllDrives)); url.setQuery(withDriveSupportQuery); QNetworkRequest request(url); diff --git a/src/drive/permissionfetchjob.cpp b/src/drive/permissionfetchjob.cpp --- a/src/drive/permissionfetchjob.cpp +++ b/src/drive/permissionfetchjob.cpp @@ -112,7 +112,7 @@ } QUrlQuery withDriveSupportQuery(url); - withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), d->supportsAllDrives ? QStringLiteral("true") : QStringLiteral("false")); + withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), Utils::bool2Str(d->supportsAllDrives)); url.setQuery(withDriveSupportQuery); QNetworkRequest request(url); diff --git a/src/drive/permissionmodifyjob.cpp b/src/drive/permissionmodifyjob.cpp --- a/src/drive/permissionmodifyjob.cpp +++ b/src/drive/permissionmodifyjob.cpp @@ -66,7 +66,7 @@ QUrl url = DriveService::modifyPermissionUrl(fileId, permission->id()); QUrlQuery withDriveSupportQuery(url); - withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), supportsAllDrives ? QStringLiteral("true") : QStringLiteral("false")); + withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), Utils::bool2Str(supportsAllDrives)); url.setQuery(withDriveSupportQuery); QNetworkRequest request(url); diff --git a/src/drive/teamdrivefetchjob.cpp b/src/drive/teamdrivefetchjob.cpp --- a/src/drive/teamdrivefetchjob.cpp +++ b/src/drive/teamdrivefetchjob.cpp @@ -34,8 +34,6 @@ namespace { static const QString MaxResultsAttr = QStringLiteral("maxResults"); static const QString UseDomainAdminAccessAttr = QStringLiteral("useDomainAdminAccess"); - static const QString True = QStringLiteral("true"); - static const QString False = QStringLiteral("false"); } using namespace KGAPI2; using namespace KGAPI2::Drive; @@ -196,7 +194,7 @@ query.addQueryItem(MaxResultsAttr, QString::number(d->maxResults)); } if (d->useDomainAdminAccess != false) { - query.addQueryItem(UseDomainAdminAccessAttr, d->useDomainAdminAccess ? True : False); + query.addQueryItem(UseDomainAdminAccessAttr, Utils::bool2Str(d->useDomainAdminAccess)); } if (!d->searchQuery.isEmpty()) { query.addQueryItem(QStringLiteral("q"), d->searchQuery.serialize());