summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2012-04-22 14:35:56 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-01 01:18:03 +0200
commite525957253de61b9f2f7066e222fa8f06a6afacc (patch)
treef91d6520804e21ca616b1249334500287e76802d
parent90c6d445120a4b057c9e75c1f004d203ec715d10 (diff)
Port QNetworkSession to QMetaMethod-based connectNotify()
The const char *-based API is deprecated and will be removed in Qt5. Change-Id: I36f6dc761e3b5a087e38db29b761c3e9237958b4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
-rw-r--r--src/network/bearer/qnetworksession.cpp13
-rw-r--r--src/network/bearer/qnetworksession.h4
2 files changed, 11 insertions, 6 deletions
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index 1a3c25a97f..90bbe1b25b 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -43,6 +43,7 @@
#include "qbearerengine_p.h"
#include <QEventLoop>
+#include <QMetaMethod>
#include <QTimer>
#include <QThread>
@@ -704,7 +705,7 @@ void QNetworkSessionPrivate::setUsagePolicies(QNetworkSession &session, QNetwork
For more details check the Forced vs ALR roaming section in the QNetworkSession
class description.
*/
-void QNetworkSession::connectNotify(const char *signal)
+void QNetworkSession::connectNotify(const QMetaMethod &signal)
{
QObject::connectNotify(signal);
@@ -713,7 +714,9 @@ void QNetworkSession::connectNotify(const char *signal)
//check for preferredConfigurationChanged() signal connect notification
//This is not required on all platforms
- if (qstrcmp(signal, SIGNAL(preferredConfigurationChanged(QNetworkConfiguration,bool))) == 0)
+ static const QMetaMethod preferredConfigurationChangedSignal =
+ QMetaMethod::fromSignal(&QNetworkSession::preferredConfigurationChanged);
+ if (signal == preferredConfigurationChangedSignal)
d->setALREnabled(true);
}
@@ -725,7 +728,7 @@ void QNetworkSession::connectNotify(const char *signal)
\sa connectNotify()
*/
-void QNetworkSession::disconnectNotify(const char *signal)
+void QNetworkSession::disconnectNotify(const QMetaMethod &signal)
{
QObject::disconnectNotify(signal);
@@ -734,7 +737,9 @@ void QNetworkSession::disconnectNotify(const char *signal)
//check for preferredConfigurationChanged() signal disconnect notification
//This is not required on all platforms
- if (qstrcmp(signal, SIGNAL(preferredConfigurationChanged(QNetworkConfiguration,bool))) == 0)
+ static const QMetaMethod preferredConfigurationChangedSignal =
+ QMetaMethod::fromSignal(&QNetworkSession::preferredConfigurationChanged);
+ if (signal == preferredConfigurationChangedSignal)
d->setALREnabled(false);
}
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h
index d72fe0e759..d713825cdf 100644
--- a/src/network/bearer/qnetworksession.h
+++ b/src/network/bearer/qnetworksession.h
@@ -134,8 +134,8 @@ Q_SIGNALS:
void usagePoliciesChanged(QNetworkSession::UsagePolicies);
protected:
- virtual void connectNotify(const char *signal);
- virtual void disconnectNotify(const char *signal);
+ virtual void connectNotify(const QMetaMethod &signal);
+ virtual void disconnectNotify(const QMetaMethod &signal);
private:
Q_DISABLE_COPY(QNetworkSession)