summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@theqtcompany.com>2016-01-07 14:46:41 +0100
committerChristian Stromme <christian.stromme@theqtcompany.com>2016-01-07 14:39:11 +0000
commit34eab6738cea227245355544bcc542a7bfd06f7c (patch)
treeeb83338cd1fd0c800bddba08e78ef3c8188ed915
parentfe505ec48b5d14d3ef3f7f6345d56501f69697e8 (diff)
Fix warnings from use of the deprecated c string to QString conversion.
Change-Id: I5bea2701cf964648ba7a65b881c8f01ad499aeb6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
-rw-r--r--src/systeminfo/linux/qscreensaver_mir.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/systeminfo/linux/qscreensaver_mir.cpp b/src/systeminfo/linux/qscreensaver_mir.cpp
index 5b6beab7..7ccd69c3 100644
--- a/src/systeminfo/linux/qscreensaver_mir.cpp
+++ b/src/systeminfo/linux/qscreensaver_mir.cpp
@@ -42,7 +42,10 @@ QT_BEGIN_NAMESPACE
QScreenSaverPrivate::QScreenSaverPrivate(QScreenSaver *parent)
: q_ptr(parent)
, m_keepDisplayOnRequestId(-1)
- , m_iface("com.canonical.Unity.Screen", "/com/canonical/Unity/Screen", "com.canonical.Unity.Screen", QDBusConnection::systemBus())
+ , m_iface(QLatin1String("com.canonical.Unity.Screen"),
+ QLatin1String("/com/canonical/Unity/Screen"),
+ QLatin1String("com.canonical.Unity.Screen"),
+ QDBusConnection::systemBus())
{
}
@@ -58,12 +61,12 @@ void QScreenSaverPrivate::setScreenSaverEnabled(bool enabled)
if (m_keepDisplayOnRequestId == -1 && !enabled) {
// set request
- QDBusMessage reply = m_iface.call("keepDisplayOn");
+ QDBusMessage reply = m_iface.call(QLatin1String("keepDisplayOn"));
if (reply.arguments().count() > 0)
m_keepDisplayOnRequestId = reply.arguments().first().toInt();
} else if (m_keepDisplayOnRequestId != -1 && enabled) {
// clear request
- m_iface.asyncCall("removeDisplayOnRequest", m_keepDisplayOnRequestId);
+ m_iface.asyncCall(QLatin1String("removeDisplayOnRequest"), m_keepDisplayOnRequestId);
m_keepDisplayOnRequestId = -1;
}
}