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;
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
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)
{
}
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; }