diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2012-03-02 13:40:22 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-23 11:22:40 +0100 |
commit | 3986b5127419dfd6db6ce667b2976d188e25d9be (patch) | |
tree | f8e633ec33d02c7bd87a6c761223e1ac88bc6a7a /src/dbus/qdbusextratypes.cpp | |
parent | 167af3b6cad5f40cafffafdc779f26ef63e62c81 (diff) |
QtDBus: don't inherit from QString, QVariant
QString and QVariant are about to be marked
Q_DECL_FINAL_CLASS, so change inheritance to
composition.
At least this was private inheritance...
Change-Id: I43caaa6c03041b8f0bd0f7987ddb4c6ff8309e50
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusextratypes.cpp')
-rw-r--r-- | src/dbus/qdbusextratypes.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dbus/qdbusextratypes.cpp b/src/dbus/qdbusextratypes.cpp index fca3a8db6e..4438e3c65f 100644 --- a/src/dbus/qdbusextratypes.cpp +++ b/src/dbus/qdbusextratypes.cpp @@ -48,17 +48,17 @@ QT_BEGIN_NAMESPACE void QDBusObjectPath::doCheck() { - if (!QDBusUtil::isValidObjectPath(*this)) { - qWarning("QDBusObjectPath: invalid path \"%s\"", qPrintable(*this)); - clear(); + if (!QDBusUtil::isValidObjectPath(m_path)) { + qWarning("QDBusObjectPath: invalid path \"%s\"", qPrintable(m_path)); + m_path.clear(); } } void QDBusSignature::doCheck() { - if (!QDBusUtil::isValidSignature(*this)) { - qWarning("QDBusSignature: invalid signature \"%s\"", qPrintable(*this)); - clear(); + if (!QDBusUtil::isValidSignature(m_signature)) { + qWarning("QDBusSignature: invalid signature \"%s\"", qPrintable(m_signature)); + m_signature.clear(); } } |