Rename and remove unused private slots.

5 files changed, 31 insertions, 85 deletions

diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp
index 0bfeb3bfe7..1d23cdc880 100644
--- a/src/network/access/qnetworkaccessbackend.cpp
+++ b/src/network/access/qnetworkaccessbackend.cpp
@@ -349,7 +349,7 @@ void QNetworkAccessBackend::sslErrors(const QList<QSslError> &errors)
 */
 bool QNetworkAccessBackend::start()
 {
-    if (!manager->session) {
+    if (!manager->networkSession) {
         open();
         return true;
     }
@@ -364,7 +364,8 @@ bool QNetworkAccessBackend::start()
         return true;
     }
 
-    if (manager->session->isOpen() && manager->session->state() == QNetworkSession::Connected) {
+    if (manager->networkSession->isOpen() &&
+        manager->networkSession->state() == QNetworkSession::Connected) {
         open();
         return true;
     }
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index e57702bb90..3324e09a3d 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -715,8 +715,8 @@ QNetworkConfiguration QNetworkAccessManager::configuration() const
 {
     Q_D(const QNetworkAccessManager);
 
-    if (d->session)
-        return d->session->configuration();
+    if (d->networkSession)
+        return d->networkSession->configuration();
     else
         return QNetworkConfiguration();
 }
@@ -732,11 +732,11 @@ QNetworkConfiguration QNetworkAccessManager::activeConfiguration() const
 {
     Q_D(const QNetworkAccessManager);
 
-    if (d->session) {
+    if (d->networkSession) {
         QNetworkConfigurationManager manager;
 
         return manager.configurationFromIdentifier(
-            d->session->sessionProperty(QLatin1String("ActiveConfiguration")).toString());
+            d->networkSession->sessionProperty(QLatin1String("ActiveConfiguration")).toString());
     } else {
         return QNetworkConfiguration();
     }
@@ -1107,89 +1107,41 @@ void QNetworkAccessManagerPrivate::createSession(const QNetworkConfiguration &co
 {
     Q_Q(QNetworkAccessManager);
 
-    if (session)
-        delete session;
+    if (networkSession)
+        delete networkSession;
 
     if (!config.isValid()) {
-        session = 0;
+        networkSession = 0;
         return;
     }
 
-    session = new QNetworkSession(config, q);
-
-    QObject::connect(session, SIGNAL(opened()), q, SLOT(_q_sessionOpened()));
-    QObject::connect(session, SIGNAL(closed()), q, SLOT(_q_sessionClosed()));
-    QObject::connect(session, SIGNAL(stateChanged(QNetworkSession::State)),
-                     q, SLOT(_q_sessionStateChanged(QNetworkSession::State)));
-    QObject::connect(session, SIGNAL(error(QNetworkSession::SessionError)),
-                     q, SLOT(_q_sessionError(QNetworkSession::SessionError)));
-    QObject::connect(session, SIGNAL(newConfigurationActivated()),
-                     q, SLOT(_q_sessionNewConfigurationActivated()));
-    QObject::connect(session, SIGNAL(preferredConfigurationChanged(QNetworkConfiguration,bool)),
-                     q, SLOT(_q_sessionPreferredConfigurationChanged(QNetworkConfiguration,bool)));
-}
-
-void QNetworkAccessManagerPrivate::_q_sessionOpened()
-{
-    Q_Q(QNetworkAccessManager);
-
-    emit q->networkSessionOnline();
-}
-
-void QNetworkAccessManagerPrivate::_q_sessionClosed()
-{
-    Q_Q(QNetworkAccessManager);
-
-    emit q->debugMessage(QLatin1String("Session Closed"));
-}
+    networkSession = new QNetworkSession(config, q);
 
-void QNetworkAccessManagerPrivate::_q_sessionError(QNetworkSession::SessionError error)
-{
-    Q_Q(QNetworkAccessManager);
-
-    emit q->debugMessage(QString::fromLatin1("Session error %1").arg(error));
-}
-
-void QNetworkAccessManagerPrivate::_q_sessionStateChanged(QNetworkSession::State state)
-{
-    qDebug() << "session state changed to" << state;
+    QObject::connect(networkSession, SIGNAL(opened()), q, SIGNAL(networkSessionOnline()));
+    QObject::connect(networkSession, SIGNAL(newConfigurationActivated()),
+                     q, SLOT(_q_networkSessionNewConfigurationActivated()));
+    QObject::connect(networkSession,
+                     SIGNAL(preferredConfigurationChanged(QNetworkConfiguration,bool)),
+                     q,
+                     SLOT(_q_networkSessionPreferredConfigurationChanged(QNetworkConfiguration,bool)));
 }
 
-void QNetworkAccessManagerPrivate::_q_sessionNewConfigurationActivated()
+void QNetworkAccessManagerPrivate::_q_networkSessionNewConfigurationActivated()
 {
     Q_Q(QNetworkAccessManager);
 
-#if 0
-    foreach (QObject *child, q->children()) {
-        QNetworkReplyImpl *reply = qobject_cast<QNetworkReplyImpl *>(child);
-        if (reply) {
-            switch (reply->d_func()->state) {
-            case QNetworkReplyImplPrivate::Buffering:
-            case QNetworkReplyImplPrivate::Working:
-                emit q->debugMessage(QString::fromLatin1("Unexpected reply for %1")
-                                        .arg(reply->url().toString()));
-                break;
-            default:
-                qDebug() << "Testing new interface for" << reply->url();
-                ;
-            }
-        }
-    }
-#endif
-
-    qDebug() << "Accepting new configuration.";
-    session->accept();
+    networkSession->accept();
 
     emit q->networkSessionOnline();
 }
 
-void QNetworkAccessManagerPrivate::_q_sessionPreferredConfigurationChanged(const QNetworkConfiguration &, bool)
+void QNetworkAccessManagerPrivate::_q_networkSessionPreferredConfigurationChanged(const QNetworkConfiguration &, bool)
 {
     Q_Q(QNetworkAccessManager);
 
     emit q->networkSessionOnline();
 
-    session->migrate();
+    networkSession->migrate();
 }
 
 QT_END_NAMESPACE
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h
index f934b226e8..a0aa2d8afa 100644
--- a/src/network/access/qnetworkaccessmanager.h
+++ b/src/network/access/qnetworkaccessmanager.h
@@ -139,12 +139,8 @@ private:
     Q_DECLARE_PRIVATE(QNetworkAccessManager)
     Q_PRIVATE_SLOT(d_func(), void _q_replyFinished())
     Q_PRIVATE_SLOT(d_func(), void _q_replySslErrors(QList<QSslError>))
-    Q_PRIVATE_SLOT(d_func(), void _q_sessionOpened())
-    Q_PRIVATE_SLOT(d_func(), void _q_sessionClosed())
-    Q_PRIVATE_SLOT(d_func(), void _q_sessionError(QNetworkSession::SessionError))
-    Q_PRIVATE_SLOT(d_func(), void _q_sessionStateChanged(QNetworkSession::State))
-    Q_PRIVATE_SLOT(d_func(), void _q_sessionNewConfigurationActivated())
-    Q_PRIVATE_SLOT(d_func(), void _q_sessionPreferredConfigurationChanged(QNetworkConfiguration,bool))
+    Q_PRIVATE_SLOT(d_func(), void _q_networkSessionNewConfigurationActivated())
+    Q_PRIVATE_SLOT(d_func(), void _q_networkSessionPreferredConfigurationChanged(QNetworkConfiguration,bool))
 };
 
 QT_END_NAMESPACE
diff --git a/src/network/access/qnetworkaccessmanager_p.h b/src/network/access/qnetworkaccessmanager_p.h
index eae08e8e51..0ac49dbc25 100644
--- a/src/network/access/qnetworkaccessmanager_p.h
+++ b/src/network/access/qnetworkaccessmanager_p.h
@@ -76,7 +76,7 @@ public:
           proxyFactory(0),
 #endif
           cookieJarCreated(false),
-          session(0),
+          networkSession(0),
           networkAccessEnabled(true)
     { }
     ~QNetworkAccessManagerPrivate();
@@ -110,12 +110,9 @@ public:
 
     void createSession(const QNetworkConfiguration &config);
 
-    void _q_sessionOpened();
-    void _q_sessionClosed();
-    void _q_sessionError(QNetworkSession::SessionError error);
-    void _q_sessionStateChanged(QNetworkSession::State state);
-    void _q_sessionNewConfigurationActivated();
-    void _q_sessionPreferredConfigurationChanged(const QNetworkConfiguration &config, bool isSeamless);
+    void _q_networkSessionNewConfigurationActivated();
+    void _q_networkSessionPreferredConfigurationChanged(const QNetworkConfiguration &config,
+                                                        bool isSeamless);
 
     // this is the cache for storing downloaded files
     QAbstractNetworkCache *networkCache;
@@ -130,7 +127,7 @@ public:
 
     bool cookieJarCreated;
 
-    QNetworkSession *session;
+    QNetworkSession *networkSession;
     bool networkAccessEnabled;
 
     // this cache can be used by individual backends to cache e.g. their TCP connections to a server
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index 70bf23861c..afa730720d 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -89,7 +89,7 @@ void QNetworkReplyImplPrivate::_q_startOperation()
         // state changes.
         state = WaitingForSession;
 
-        QNetworkSession *session = manager->d_func()->session;
+        QNetworkSession *session = manager->d_func()->networkSession;
 
         if (session) {
             if (!session->isOpen())
@@ -559,7 +559,7 @@ void QNetworkReplyImplPrivate::finished()
     QVariant totalSize = cookedHeaders.value(QNetworkRequest::ContentLengthHeader);
     if (preMigrationDownloaded != Q_INT64_C(-1))
         totalSize = totalSize.toLongLong() + preMigrationDownloaded;
-    QNetworkSession *session = manager->d_func()->session;
+    QNetworkSession *session = manager->d_func()->networkSession;
     if (session && session->state() == QNetworkSession::Roaming &&
         state == Working && errorCode != QNetworkReply::OperationCanceledError) {
         // only content with a known size will fail with a temporary network failure error