diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-04-23 21:36:04 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-01 01:18:03 +0200 |
commit | 31e9f2a7a57770875b79593a73b3c5e0e610ef23 (patch) | |
tree | af978efd85eaa41bb0a12e891dd1c017ecf50663 /src/plugins/bearer/connman/qconnmanservice_linux_p.h | |
parent | a08e0fca276341396d92c63dd4a417cb482de82d (diff) |
Port bearer plugins to QMetaMethod-based connectNotify()
The const char *-based API is deprecated and will be removed in Qt5.
Some of the reimplementations were commented out since the signals
being checked for aren't even declared by the relevant classes.
Change-Id: I4486d1f3242db21cebd55fb53def3904f7c236ba
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/plugins/bearer/connman/qconnmanservice_linux_p.h')
-rw-r--r-- | src/plugins/bearer/connman/qconnmanservice_linux_p.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux_p.h b/src/plugins/bearer/connman/qconnmanservice_linux_p.h index 5a1778605e..3e5915c8f4 100644 --- a/src/plugins/bearer/connman/qconnmanservice_linux_p.h +++ b/src/plugins/bearer/connman/qconnmanservice_linux_p.h @@ -144,8 +144,8 @@ Q_SIGNALS: void propertyChangedContext(const QString &,const QString &,const QDBusVariant &); protected: - void connectNotify(const char *signal); - void disconnectNotify(const char *signal); + void connectNotify(const QMetaMethod &signal); + void disconnectNotify(const QMetaMethod &signal); QVariant getProperty(const QString &); }; @@ -171,8 +171,8 @@ private: QConnmanProfileInterfacePrivate *d; protected: - void connectNotify(const char *signal); - void disconnectNotify(const char *signal); + void connectNotify(const QMetaMethod &signal); + void disconnectNotify(const QMetaMethod &signal); QVariant getProperty(const QString &); }; @@ -233,8 +233,8 @@ Q_SIGNALS: void propertyChangedContext(const QString &,const QString &,const QDBusVariant &); protected: - void connectNotify(const char *signal); - void disconnectNotify(const char *signal); + void connectNotify(const QMetaMethod &signal); + void disconnectNotify(const QMetaMethod &signal); QVariant getProperty(const QString &); }; @@ -257,8 +257,8 @@ Q_SIGNALS: void propertyChanged(const QString &, const QDBusVariant &value); void propertyChangedContext(const QString &,const QString &,const QDBusVariant &); protected: - void connectNotify(const char *signal); - void disconnectNotify(const char *signal); + void connectNotify(const QMetaMethod &signal); + void disconnectNotify(const QMetaMethod &signal); QVariant getProperty(const QString &); }; @@ -277,8 +277,8 @@ public: // dict requestInput(QDBusObjectPath &path, dict fields); void cancel(); protected: - void connectNotify(const char *signal); - void disconnectNotify(const char *signal); + void connectNotify(const QMetaMethod &signal); + void disconnectNotify(const QMetaMethod &signal); }; class QConnmanCounterInterfacePrivate; |