git.iko.soy/unity8
on xenial help sign in
clazy fixes
c79490aAlbert Astals Cid
plugins/IntegratedLightDM/liblightdm/UsersModel.cpp−2
compare with xenial
unifiedsplit
@@ -40,8 +40,6 @@ UsersModel::UsersModel(QObject *parent) :
40 QAbstractListModel(parent),
40 QAbstractListModel(parent),
41 d_ptr(new UsersModelPrivate(this))
41 d_ptr(new UsersModelPrivate(this))
42{
42{
43− Q_D(UsersModel);
44−
45 // Extend roleNames (we want to keep the "display" role)
43 // Extend roleNames (we want to keep the "display" role)
46 QHash<int, QByteArray> roles = roleNames();
44 QHash<int, QByteArray> roles = roleNames();
47 roles[NameRole] = "name";
45 roles[NameRole] = "name";
plugins/Ubuntu/Gestures/TouchGestureArea.h+1−1
@@ -176,7 +176,7 @@ Q_SIGNALS:
176 void clicked();
176 void clicked();
177
177
178protected:
178protected:
179− void itemChange(ItemChange change, const ItemChangeData &value);
179+ void itemChange(ItemChange change, const ItemChangeData &value) override;
180
180
181private Q_SLOTS:
181private Q_SLOTS:
182 void rejectGesture();
182 void rejectGesture();
plugins/Utils/deviceconfigparser.cpp+1−1
@@ -25,7 +25,7 @@ DeviceConfigParser::DeviceConfigParser(QObject *parent): QObject(parent)
25{
25{
26 QString path;
26 QString path;
27 Q_FOREACH (const QString &standardPath, QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)) {
27 Q_FOREACH (const QString &standardPath, QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)) {
28− if (QFileInfo(standardPath + "/devices.conf").exists()) {
28+ if (QFileInfo::exists(standardPath + "/devices.conf")) {
29 path = standardPath + "/devices.conf";
29 path = standardPath + "/devices.conf";
30 break;
30 break;
31 }
31 }
plugins/Utils/timezoneFormatter.cpp+1−1
@@ -39,7 +39,7 @@ QString TimezoneFormatter::currentTimeInTimezoneWithAbbrev(const QVariant &tzId)
39 QTimeZone tz(tzId.toByteArray());
39 QTimeZone tz(tzId.toByteArray());
40 if (tz.isValid()) {
40 if (tz.isValid()) {
41 const QDateTime now = QDateTime::currentDateTime().toTimeZone(tz);
41 const QDateTime now = QDateTime::currentDateTime().toTimeZone(tz);
42− return QStringLiteral("%1 %2").arg(now.time().toString(QStringLiteral("h:mm"))).arg(tz.abbreviation(now));
42+ return QStringLiteral("%1 %2").arg(now.time().toString(QStringLiteral("h:mm")), tz.abbreviation(now));
43 }
43 }
44 return QString();
44 return QString();
45}
45}
plugins/Wizard/timezonemodel.cpp+5−5
@@ -60,12 +60,12 @@ QVariant TimeZoneLocationModel::data(const QModelIndex &index, int role) const
60
60
61 switch (role) {
61 switch (role) {
62 case Qt::DisplayRole:
62 case Qt::DisplayRole:
63− return QStringLiteral("%1, %2, %3").arg(geonames_city_get_name(city))
63+ return QStringLiteral("%1, %2, %3").arg(geonames_city_get_name(city),
64− .arg(geonames_city_get_state(city))
64+ geonames_city_get_state(city),
65− .arg(geonames_city_get_country(city));
65+ geonames_city_get_country(city));
66 case SimpleRole:
66 case SimpleRole:
67− return QStringLiteral("%1, %2").arg(geonames_city_get_name(city))
67+ return QStringLiteral("%1, %2").arg(geonames_city_get_name(city),
68− .arg(geonames_city_get_country(city));
68+ geonames_city_get_country(city));
69 case TimeZoneRole:
69 case TimeZoneRole:
70 return geonames_city_get_timezone(city);
70 return geonames_city_get_timezone(city);
71 case CountryRole:
71 case CountryRole:
tools/registry-tracker.cpp+2−2
@@ -110,7 +110,7 @@ void RegistryTracker::runRegistry()
110 }
110 }
111
111
112 // FIXME: keep in sync with the SSRegistry config
112 // FIXME: keep in sync with the SSRegistry config
113− QString runtime_ini = QString(RUNTIME_CONFIG).arg(m_registry_config.fileName()).arg(m_mw_config.fileName()).arg(m_serverScopes ? "SSRegistry" : "");
113+ QString runtime_ini = QString(RUNTIME_CONFIG).arg(m_registry_config.fileName(), m_mw_config.fileName(), m_serverScopes ? "SSRegistry" : "");
114 if (!m_systemScopes) {
114 if (!m_systemScopes) {
115 m_scopeInstallDir.reset(new QTemporaryDir(tmp.filePath("scopes.XXXXXX")));
115 m_scopeInstallDir.reset(new QTemporaryDir(tmp.filePath("scopes.XXXXXX")));
116 if (!m_scopeInstallDir->isValid()) {
116 if (!m_scopeInstallDir->isValid()) {
@@ -118,7 +118,7 @@ void RegistryTracker::runRegistry()
118 }
118 }
119 scopeInstallDir = m_scopeInstallDir->path();
119 scopeInstallDir = m_scopeInstallDir->path();
120 }
120 }
121− QString registry_ini = QString(REGISTRY_CONFIG).arg(m_mw_config.fileName()).arg(scopeInstallDir).arg(scopeRunnerBin);
121+ QString registry_ini = QString(REGISTRY_CONFIG).arg(m_mw_config.fileName(), scopeInstallDir, scopeRunnerBin);
122 QString mw_ini = QString(MW_CONFIG).arg(m_endpoints_dir.path());
122 QString mw_ini = QString(MW_CONFIG).arg(m_endpoints_dir.path());
123
123
124 if (!m_systemScopes) {
124 if (!m_systemScopes) {