From a30021ded7501bb122c8f3c37cc9ced96e00e7d2 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Mon, 18 Jan 2010 15:20:33 +1000
Subject: Make compile on Unix.

---
 src/network/bearer/qnetworksession_p.h                 |  2 +-
 src/plugins/bearer/networkmanager/networkmanager.pro   |  6 ++++--
 .../bearer/networkmanager/qnetworkmanagerengine.cpp    | 18 ++++++++++++++++++
 .../bearer/networkmanager/qnetworkmanagerengine.h      |  2 ++
 src/plugins/bearer/qnetworksession_impl.cpp            |  2 +-
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h
index 6395250..a6bb7cb 100644
--- a/src/network/bearer/qnetworksession_p.h
+++ b/src/network/bearer/qnetworksession_p.h
@@ -90,7 +90,7 @@ public:
     virtual void close() = 0;
     virtual void stop() = 0;
 
-    virtual void setALREnabled(bool enabled) { }
+    virtual void setALREnabled(bool /*enabled*/) { }
     virtual void migrate() = 0;
     virtual void accept() = 0;
     virtual void ignore() = 0;
diff --git a/src/plugins/bearer/networkmanager/networkmanager.pro b/src/plugins/bearer/networkmanager/networkmanager.pro
index 57f7ca7..2050125 100644
--- a/src/plugins/bearer/networkmanager/networkmanager.pro
+++ b/src/plugins/bearer/networkmanager/networkmanager.pro
@@ -7,12 +7,14 @@ DEFINES += BACKEND_NM
 
 HEADERS += qnmdbushelper.h \
            qnetworkmanagerservice.h \
-           qnetworkmanagerengine.h
+           qnetworkmanagerengine.h \
+           ../qnetworksession_impl.h
 
 SOURCES += main.cpp \
            qnmdbushelper.cpp \
            qnetworkmanagerservice.cpp \
-           qnetworkmanagerengine.cpp
+           qnetworkmanagerengine.cpp \
+           ../qnetworksession_impl.cpp
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer
 target.path += $$[QT_INSTALL_PLUGINS]/bearer
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
index e1fcd46..9064005 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
@@ -41,6 +41,7 @@
 
 #include "qnetworkmanagerengine.h"
 #include "qnetworkmanagerservice.h"
+#include "../qnetworksession_impl.h"
 
 #include <QtNetwork/private/qnetworkconfiguration_p.h>
 
@@ -238,6 +239,8 @@ void QNetworkManagerEngine::requestUpdate()
 void QNetworkManagerEngine::interfacePropertiesChanged(const QString &path,
                                                        const QMap<QString, QVariant> &properties)
 {
+    Q_UNUSED(path)
+
     QMapIterator<QString, QVariant> i(properties);
     while (i.hasNext()) {
         i.next();
@@ -302,6 +305,8 @@ void QNetworkManagerEngine::interfacePropertiesChanged(const QString &path,
 void QNetworkManagerEngine::activeConnectionPropertiesChanged(const QString &path,
                                                               const QMap<QString, QVariant> &properties)
 {
+    Q_UNUSED(properties)
+
     QNetworkManagerConnectionActive *activeConnection = activeConnections.value(path);
 
     if (!activeConnection)
@@ -396,6 +401,8 @@ void QNetworkManagerEngine::newConnection(const QDBusObjectPath &path,
 
 void QNetworkManagerEngine::removeConnection(const QString &path)
 {
+    Q_UNUSED(path)
+
     QNetworkManagerSettingsConnection *connection =
         qobject_cast<QNetworkManagerSettingsConnection *>(sender());
     if (!connection)
@@ -473,6 +480,8 @@ void QNetworkManagerEngine::activationFinished(QDBusPendingCallWatcher *watcher)
 
 void QNetworkManagerEngine::newAccessPoint(const QString &path, const QDBusObjectPath &objectPath)
 {
+    Q_UNUSED(path)
+
     QNetworkManagerInterfaceAccessPoint *accessPoint =
         new QNetworkManagerInterfaceAccessPoint(objectPath.path());
     accessPoints.append(accessPoint);
@@ -524,6 +533,8 @@ void QNetworkManagerEngine::newAccessPoint(const QString &path, const QDBusObjec
 void QNetworkManagerEngine::removeAccessPoint(const QString &path,
                                               const QDBusObjectPath &objectPath)
 {
+    Q_UNUSED(path)
+
     for (int i = 0; i < accessPoints.count(); ++i) {
         QNetworkManagerInterfaceAccessPoint *accessPoint = accessPoints.at(i);
 
@@ -546,6 +557,8 @@ void QNetworkManagerEngine::removeAccessPoint(const QString &path,
 
 void QNetworkManagerEngine::updateAccessPoint(const QMap<QString, QVariant> &map)
 {
+    Q_UNUSED(map)
+
     QNetworkManagerInterfaceAccessPoint *accessPoint =
         qobject_cast<QNetworkManagerInterfaceAccessPoint *>(sender());
     if (!accessPoint)
@@ -673,5 +686,10 @@ QNetworkConfigurationManager::Capabilities QNetworkManagerEngine::capabilities()
            QNetworkConfigurationManager::CanStartAndStopInterfaces;
 }
 
+QNetworkSessionPrivate *QNetworkManagerEngine::createSessionBackend()
+{
+    return new QNetworkSessionPrivateImpl;
+}
+
 QT_END_NAMESPACE
 
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
index 3752dce..11255fc 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.h
@@ -84,6 +84,8 @@ public:
 
     QNetworkConfigurationManager::Capabilities capabilities() const;
 
+    QNetworkSessionPrivate *createSessionBackend();
+
 private Q_SLOTS:
     void interfacePropertiesChanged(const QString &path,
                                     const QMap<QString, QVariant> &properties);
diff --git a/src/plugins/bearer/qnetworksession_impl.cpp b/src/plugins/bearer/qnetworksession_impl.cpp
index 49a2d72..a826fd6 100644
--- a/src/plugins/bearer/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/qnetworksession_impl.cpp
@@ -79,7 +79,7 @@ Q_SIGNALS:
     void forcedSessionClose(const QNetworkConfiguration &config);
 };
 
-#include "qnetworksession_p.moc"
+#include "qnetworksession_impl.moc"
 
 Q_GLOBAL_STATIC(QNetworkSessionManagerPrivate, sessionManager);
 
-- 
cgit v0.12