summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/eglfs
diff options
context:
space:
mode:
authorAndrew Knight <andrew.knight@intopalo.com>2015-03-09 12:56:40 +0200
committerAndrew Knight <qt@panimo.net>2015-03-09 11:10:10 +0000
commit0fce009f1c72806c349de6892d514ec540b02e44 (patch)
treebf6b4f1d4f12b09ec0f7feeda2751069174dc65f /src/plugins/platforms/eglfs
parent59495d180bf0538ae777617a2b5ba9a10e79eedf (diff)
eglfs_kms: remove deprecated QString uses
Fixes "warning: ‘QString::QString(const char*)’ is deprecated" While we're here, make the locals const. Change-Id: Iee70253a46f91937b93e06cc08cd361716cd669d Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/eglfs')
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsintegration.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsintegration.cpp
index 4598f21d92..7bb932cf00 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsintegration.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsintegration.cpp
@@ -223,25 +223,25 @@ void QEglFSKmsIntegration::loadConfig()
return;
}
- QJsonDocument doc = QJsonDocument::fromJson(file.readAll());
+ const QJsonDocument doc = QJsonDocument::fromJson(file.readAll());
if (!doc.isObject()) {
qCDebug(qLcEglfsKmsDebug) << "Invalid config file" << json
<< "- no top-level JSON object";
return;
}
- QJsonObject object = doc.object();
+ const QJsonObject object = doc.object();
- m_hwCursor = object.value("hwcursor").toBool(m_hwCursor);
- m_pbuffers = object.value("pbuffers").toBool(m_pbuffers);
- m_devicePath = object.value("device").toString();
+ m_hwCursor = object.value(QStringLiteral("hwcursor")).toBool(m_hwCursor);
+ m_pbuffers = object.value(QStringLiteral("pbuffers")).toBool(m_pbuffers);
+ m_devicePath = object.value(QStringLiteral("device")).toString();
- QJsonArray outputs = object.value("outputs").toArray();
+ const QJsonArray outputs = object.value(QStringLiteral("outputs")).toArray();
for (int i = 0; i < outputs.size(); i++) {
- QVariantMap outputSettings = outputs.at(i).toObject().toVariantMap();
+ const QVariantMap outputSettings = outputs.at(i).toObject().toVariantMap();
- if (outputSettings.contains("name")) {
- QString name = outputSettings.value("name").toString();
+ if (outputSettings.contains(QStringLiteral("name"))) {
+ const QString name = outputSettings.value(QStringLiteral("name")).toString();
if (m_outputSettings.contains(name)) {
qCDebug(qLcEglfsKmsDebug) << "Output" << name << "configured multiple times!";