Merge

Author: tsdgeos

plugins/IntegratedLightDM/liblightdm/UsersModel.cpp

@@ -40,8 +40,6 @@ UsersModel::UsersModel(QObject *parent) :
     QAbstractListModel(parent),
     d_ptr(new UsersModelPrivate(this))
 {
-    Q_D(UsersModel);
-
     // Extend roleNames (we want to keep the "display" role)
     QHash<int, QByteArray> roles = roleNames();
     roles[NameRole] = "name";

plugins/Ubuntu/Gestures/TouchGestureArea.h

@@ -176,7 +176,7 @@ class UBUNTUGESTURESQML_EXPORT TouchGestureArea : public QQuickItem
     void clicked();
 
 protected:
-    void itemChange(ItemChange change, const ItemChangeData &value);
+    void itemChange(ItemChange change, const ItemChangeData &value) override;
 
 private Q_SLOTS:
     void rejectGesture();

plugins/Utils/deviceconfigparser.cpp

@@ -26,7 +26,7 @@ DeviceConfigParser::DeviceConfigParser(QObject *parent): QObject(parent)
     // Local files have highest priority
     QString path;
     Q_FOREACH (const QString &standardPath, QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)) {
-        if (QFileInfo(standardPath + "/devices.conf").exists()) {
+        if (QFileInfo::exists(standardPath + "/devices.conf")) {
             path = standardPath + "/devices.conf";
             break;
         }

plugins/Utils/timezoneFormatter.cpp

@@ -39,7 +39,7 @@ QString TimezoneFormatter::currentTimeInTimezoneWithAbbrev(const QVariant &tzId)
     QTimeZone tz(tzId.toByteArray());
     if (tz.isValid()) {
         const QDateTime now = QDateTime::currentDateTime().toTimeZone(tz);
-        return QStringLiteral("%1 %2").arg(now.time().toString(QStringLiteral("h:mm"))).arg(tz.abbreviation(now));
+        return QStringLiteral("%1 %2").arg(now.time().toString(QStringLiteral("h:mm")), tz.abbreviation(now));
     }
     return QString();
 }

plugins/Wizard/timezonemodel.cpp

@@ -60,12 +60,12 @@ QVariant TimeZoneLocationModel::data(const QModelIndex &index, int role) const
 
     switch (role) {
     case Qt::DisplayRole:
-        return QStringLiteral("%1, %2, %3").arg(geonames_city_get_name(city))
-                                           .arg(geonames_city_get_state(city))
-                                           .arg(geonames_city_get_country(city));
+        return QStringLiteral("%1, %2, %3").arg(geonames_city_get_name(city),
+                                                geonames_city_get_state(city),
+                                                geonames_city_get_country(city));
     case SimpleRole:
-        return QStringLiteral("%1, %2").arg(geonames_city_get_name(city))
-                                       .arg(geonames_city_get_country(city));
+        return QStringLiteral("%1, %2").arg(geonames_city_get_name(city),
+                                            geonames_city_get_country(city));
     case TimeZoneRole:
         return geonames_city_get_timezone(city);
     case CountryRole:

tools/registry-tracker.cpp

@@ -110,15 +110,15 @@ void RegistryTracker::runRegistry()
     }
 
     // FIXME: keep in sync with the SSRegistry config
-    QString runtime_ini = QString(RUNTIME_CONFIG).arg(m_registry_config.fileName()).arg(m_mw_config.fileName()).arg(m_serverScopes ? "SSRegistry" : "");
+    QString runtime_ini = QString(RUNTIME_CONFIG).arg(m_registry_config.fileName(), m_mw_config.fileName(), m_serverScopes ? "SSRegistry" : "");
     if (!m_systemScopes) {
         m_scopeInstallDir.reset(new QTemporaryDir(tmp.filePath("scopes.XXXXXX")));
         if (!m_scopeInstallDir->isValid()) {
             qWarning("Unable to create temporary scopes directory!");
         }
         scopeInstallDir = m_scopeInstallDir->path();
     }
-    QString registry_ini = QString(REGISTRY_CONFIG).arg(m_mw_config.fileName()).arg(scopeInstallDir).arg(scopeRunnerBin);
+    QString registry_ini = QString(REGISTRY_CONFIG).arg(m_mw_config.fileName(), scopeInstallDir, scopeRunnerBin);
     QString mw_ini = QString(MW_CONFIG).arg(m_endpoints_dir.path());
 
     if (!m_systemScopes) {