From: Ivailo Monev <xakepa10@laimg.moc>
Date: Sat, 18 May 2019 23:51:06 +0000 (+0000)
Subject: fix dbus const correctness
X-Git-Tag: 4.12.0~6032
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7b1c906a1826214373ce6ec9d877a317b92866cf;p=kde%2FKatie.git

fix dbus const correctness

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---

diff --git a/src/dbus/qdbusabstractinterface_p.h b/src/dbus/qdbusabstractinterface_p.h
index 572919fd7..02cae196e 100644
--- a/src/dbus/qdbusabstractinterface_p.h
+++ b/src/dbus/qdbusabstractinterface_p.h
@@ -70,7 +70,7 @@ class QDBusAbstractInterfacePrivate : public QObjectPrivate
 public:
     Q_DECLARE_PUBLIC(QDBusAbstractInterface)
 
-    mutable QDBusConnection connection; // mutable because we want to make calls from const functions
+    QDBusConnection connection;
     QString service;
     QString currentOwner;
     QString path;
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h
index 2651d26ce..b65892f8f 100644
--- a/src/dbus/qdbusconnection_p.h
+++ b/src/dbus/qdbusconnection_p.h
@@ -86,14 +86,14 @@ class QDBusPendingCallPrivate;
 
 class QDBusErrorInternal
 {
-    mutable DBusError error;
+    DBusError error;
     Q_DISABLE_COPY(QDBusErrorInternal)
 public:
     inline QDBusErrorInternal() { dbus_error_init(&error); }
     inline ~QDBusErrorInternal() { dbus_error_free(&error); }
     inline bool operator !() const { return !dbus_error_is_set(&error); }
     inline operator DBusError *() { dbus_error_free(&error); return &error; }
-    inline operator QDBusError() const { QDBusError err(&error); dbus_error_free(&error); return err; }
+    inline operator QDBusError() const { QDBusError err(&error); return err; }
 };
 
 // QDBusConnectionPrivate holds the DBusConnection and
diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp
index d719dafcb..339b61ab5 100644
--- a/src/dbus/qdbusmessage.cpp
+++ b/src/dbus/qdbusmessage.cpp
@@ -63,7 +63,7 @@ static inline const char *data(const QByteArray &arr)
 QDBusMessagePrivate::QDBusMessagePrivate()
     : msg(0), reply(0), type(DBUS_MESSAGE_TYPE_INVALID),
       timeout(-1), localReply(0), ref(1), delayedReply(false), localMessage(false),
-      parametersValidated(false), autoStartService(true)
+      autoStartService(true), parametersValidated(false)
 {
 }
 
diff --git a/src/dbus/qdbusmessage_p.h b/src/dbus/qdbusmessage_p.h
index 735713730..25859dd45 100644
--- a/src/dbus/qdbusmessage_p.h
+++ b/src/dbus/qdbusmessage_p.h
@@ -81,13 +81,13 @@ public:
     DBusMessage *reply;
     int type;
     int timeout;
-    mutable QDBusMessage *localReply;
+    QDBusMessage *localReply;
     QAtomicInt ref;
 
-    mutable uint delayedReply : 1;
-    uint localMessage : 1;
-    mutable uint parametersValidated : 1;
-    uint autoStartService : 1;
+    bool delayedReply;
+    bool localMessage;
+    bool autoStartService;
+    mutable bool parametersValidated;
 
     static void setParametersValidated(QDBusMessage &msg, bool enable)
     { msg.d_ptr->parametersValidated = enable; }