whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove S60/symbian specific code in plugins/bearer 

Clean up and remove Symbian specific code and data.

Change-Id: Icef41c22f143278a66f6a46ca80c495d083bf9a9
Reviewed-by: Alex <alex.blasche@nokia.com>
bb10
Liang Qi 2011-10-31 13:44:01 +01:00 committed by Qt by Nokia
parent 768bc406f7
commit 1365d290c6
11 changed files with 0 additions and 3617 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/bearer/bearer.pro
View File

@ -14,6 +14,5 @@ win32:SUBDIRS += generic
win32:!wince*:SUBDIRS += nativewifi
macx:contains(QT_CONFIG, corewlan):SUBDIRS += corewlan
macx:SUBDIRS += generic
symbian:SUBDIRS += symbian
isEmpty(SUBDIRS):SUBDIRS = generic

9
src/plugins/bearer/symbian/3_1/3_1.pro
View File

@ -1,9 +0,0 @@
include(../symbian.pri)
is_using_gnupoc {
LIBS += -lapengine
} else {
LIBS += -lAPEngine
}
TARGET = $${TARGET}_3_1
TARGET.UID3 = 0x2002131C

17
src/plugins/bearer/symbian/3_2/3_2.pro
View File

@ -1,17 +0,0 @@
include(../symbian.pri)
symbian {
contains(S60_VERSION, 3.1) {
is_using_gnupoc {
LIBS += -lapengine
} else {
LIBS += -lAPEngine
}
} else {
DEFINES += SNAP_FUNCTIONALITY_AVAILABLE
LIBS += -lcmmanager
}
}
TARGET = $${TARGET}_3_2
TARGET.UID3 = 0x2002131D

88
src/plugins/bearer/symbian/main.cpp
View File

@ -1,88 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the plugins of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this
** file. Please review the following information to ensure the GNU Lesser
** General Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU General
** Public License version 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this
** file. Please review the following information to ensure the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "symbianengine.h"
#include <QtNetwork/private/qbearerplugin_p.h>
#include <QtCore/qdebug.h>
#ifndef QT_NO_BEARERMANAGEMENT
QT_BEGIN_NAMESPACE
class QSymbianEnginePlugin : public QBearerEnginePlugin
{
public:
QSymbianEnginePlugin();
~QSymbianEnginePlugin();
QStringList keys() const;
QBearerEngine *create(const QString &key) const;
};
QSymbianEnginePlugin::QSymbianEnginePlugin()
{
}
QSymbianEnginePlugin::~QSymbianEnginePlugin()
{
}
QStringList QSymbianEnginePlugin::keys() const
{
return QStringList() << QLatin1String("symbian");
}
QBearerEngine *QSymbianEnginePlugin::create(const QString &key) const
{
if (key == QLatin1String("symbian"))
return new SymbianEngine;
else
return 0;
}
Q_EXPORT_STATIC_PLUGIN(QSymbianEnginePlugin)
Q_EXPORT_PLUGIN2(qsymbianbearer, QSymbianEnginePlugin)
QT_END_NAMESPACE
#endif // QT_NO_BEARERMANAGEMENT

1549
src/plugins/bearer/symbian/qnetworksession_impl.cpp
View File

File diff suppressed because it is too large Load Diff

237
src/plugins/bearer/symbian/qnetworksession_impl.h
View File

@ -1,237 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the plugins of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this
** file. Please review the following information to ensure the GNU Lesser
** General Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU General
** Public License version 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this
** file. Please review the following information to ensure the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QNETWORKSESSION_IMPL_H
#define QNETWORKSESSION_IMPL_H
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists purely as an
// implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
//
#include <QtNetwork/private/qnetworksession_p.h>
#include <QDateTime>
#include <e32base.h>
#include <commdbconnpref.h>
#include <es_sock.h>
#include <rconnmon.h>
#ifdef SNAP_FUNCTIONALITY_AVAILABLE
#include <comms-infras/cs_mobility_apiext.h>
#endif
QT_BEGIN_NAMESPACE
class ConnectionProgressNotifier;
class ConnectionStarter;
class SymbianEngine;
typedef void (*TOpenCUnSetdefaultifFunction)();
class QNetworkSessionPrivateImpl : public QNetworkSessionPrivate
#ifdef SNAP_FUNCTIONALITY_AVAILABLE
, public MMobilityProtocolResp
#endif
{
Q_OBJECT
public:
QNetworkSessionPrivateImpl(SymbianEngine *engine);
~QNetworkSessionPrivateImpl();
//called by QNetworkSession constructor and ensures
//that the state is immediately updated (w/o actually opening
//a session). Also this function should take care of
//notification hooks to discover future state changes.
void syncStateWithInterface();
#ifndef QT_NO_NETWORKINTERFACE
QNetworkInterface currentInterface() const;
#endif
QVariant sessionProperty(const QString& key) const;
void setSessionProperty(const QString& key, const QVariant& value);
void setALREnabled(bool enabled);
void open();
inline void close() { close(true); }
void close(bool allowSignals);
void stop();
void migrate();
void accept();
void ignore();
void reject();
QString errorString() const; //must return translated string
QNetworkSession::SessionError error() const;
quint64 bytesWritten() const;
quint64 bytesReceived() const;
quint64 activeTime() const;
RConnection* nativeSession();
#ifdef SNAP_FUNCTIONALITY_AVAILABLE
public: // From MMobilityProtocolResp
void PreferredCarrierAvailable(TAccessPointInfo aOldAPInfo,
TAccessPointInfo aNewAPInfo,
TBool aIsUpgrade,
TBool aIsSeamless);
void NewCarrierActive(TAccessPointInfo aNewAPInfo, TBool aIsSeamless);
void Error(TInt aError);
#endif
protected: // From CActive
void ConnectionStartComplete(TInt statusCode);
void DoCancel();
private Q_SLOTS:
void configurationStateChanged(quint32 accessPointId, quint32 connMonId,
QNetworkSession::State newState);
void configurationRemoved(QNetworkConfigurationPrivatePointer config);
void configurationAdded(QNetworkConfigurationPrivatePointer config);
private:
TUint iapClientCount(TUint aIAPId) const;
quint64 transferredData(TUint dataType) const;
bool newState(QNetworkSession::State newState, TUint accessPointId = 0);
void handleSymbianConnectionStatusChange(TInt aConnectionStatus, TInt aError, TUint accessPointId = 0);
QNetworkConfiguration bestConfigFromSNAP(const QNetworkConfiguration& snapConfig) const;
QNetworkConfiguration activeConfiguration(TUint32 iapId = 0) const;
#ifndef QT_NO_NETWORKINTERFACE
QNetworkInterface interface(TUint iapId) const;
#endif
#if defined(SNAP_FUNCTIONALITY_AVAILABLE)
bool easyWlanTrueIapId(TUint32 &trueIapId) const;
#endif
void closeHandles();
private: // data
SymbianEngine *engine;
#ifndef QT_NO_NETWORKINTERFACE
mutable QNetworkInterface activeInterface;
#endif
QDateTime startTime;
mutable RSocketServ &iSocketServ; //not owned, shared from QtCore
mutable RConnection iConnection;
mutable RConnectionMonitor iConnectionMonitor;
ConnectionProgressNotifier* ipConnectionNotifier;
ConnectionStarter* ipConnectionStarter;
bool iHandleStateNotificationsFromManager;
bool iFirstSync;
bool iStoppedByUser;
bool iClosedByUser;
#ifdef SNAP_FUNCTIONALITY_AVAILABLE
CActiveCommsMobilityApiExt* iMobility;
#endif
QNetworkSession::SessionError iError;
TInt iALREnabled;
TBool iALRUpgradingConnection;
TBool iConnectInBackground;
QList<QString> iKnownConfigsBeforeConnectionStart;
TUint32 iOldRoamingIap;
TUint32 iNewRoamingIap;
bool isOpening;
friend class ConnectionProgressNotifier;
friend class ConnectionStarter;
};
class ConnectionProgressNotifier : public CActive
{
public:
ConnectionProgressNotifier(QNetworkSessionPrivateImpl &owner, RConnection &connection);
~ConnectionProgressNotifier();
void StartNotifications();
void StopNotifications();
protected: // From CActive
void RunL();
void DoCancel();
private: // Data
QNetworkSessionPrivateImpl &iOwner;
RConnection& iConnection;
TNifProgressBuf iProgress;
};
class ConnectionStarter : public CActive
{
public:
ConnectionStarter(QNetworkSessionPrivateImpl &owner, RConnection &connection);
~ConnectionStarter();
void Start();
void Start(TConnPref &pref);
protected:
void RunL();
TInt RunError(TInt err);
void DoCancel();
private: // Data
QNetworkSessionPrivateImpl &iOwner;
RConnection& iConnection;
};
QT_END_NAMESPACE
#endif //QNETWORKSESSION_IMPL_H

32
src/plugins/bearer/symbian/symbian.pri
View File

@ -1,32 +0,0 @@
TARGET = qsymbianbearer
load(qt_plugin)
QT = core network
HEADERS += ../symbianengine.h \
../qnetworksession_impl.h
SOURCES += ../symbianengine.cpp \
../qnetworksession_impl.cpp \
../main.cpp
INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
symbian-abld:INCLUDEPATH += $$QT_BUILD_TREE/include/QtNetwork/private
LIBS += -lcommdb \
-lcentralrepository \
-lesock \
-linsock \
-lecom \
-lefsrv \
-lnetmeta
is_using_gnupoc {
LIBS += -lconnmon
} else {
LIBS += -lConnMon
}
DESTDIR = $$QT.network.plugins/bearer
target.path += $$[QT_INSTALL_PLUGINS]/bearer
INSTALLS += target

8
src/plugins/bearer/symbian/symbian.pro
View File

@ -1,8 +0,0 @@
TEMPLATE = subdirs
contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
SUBDIRS += 3_1 3_2
}
# Symbian3 builds the default plugin for winscw so it is always needed
SUBDIRS += symbian_3

21
src/plugins/bearer/symbian/symbian_3/symbian_3.pro
View File

@ -1,21 +0,0 @@
include(../symbian.pri)
symbian {
contains(S60_VERSION, 3.1) {
is_using_gnupoc {
LIBS += -lapengine
} else {
LIBS += -lAPEngine
}
} else {
DEFINES += SNAP_FUNCTIONALITY_AVAILABLE
LIBS += -lcmmanager
!contains(S60_VERSION, 3.2):!contains(S60_VERSION, 5.0) {
DEFINES += OCC_FUNCTIONALITY_AVAILABLE
LIBS += -lextendedconnpref
}
}
}
TARGET.UID3 = 0x20021319

1409
src/plugins/bearer/symbian/symbianengine.cpp
View File

File diff suppressed because it is too large Load Diff

246
src/plugins/bearer/symbian/symbianengine.h
View File

@ -1,246 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the plugins of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this
** file. Please review the following information to ensure the GNU Lesser
** General Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU General
** Public License version 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this
** file. Please review the following information to ensure the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef SYMBIANENGINE_H
#define SYMBIANENGINE_H
#include <QtCore/qstringlist.h>
#include <QtNetwork/private/qbearerengine_p.h>
#include <QtNetwork/qnetworkconfigmanager.h>
#include <QHash>
#include <rconnmon.h>
#ifdef SNAP_FUNCTIONALITY_AVAILABLE
#include <cmmanager.h>
#endif
// Uncomment and compile QtBearer to gain detailed state tracing
// #define QT_BEARERMGMT_SYMBIAN_DEBUG
#define QT_BEARERMGMT_CONFIGURATION_SNAP_PREFIX QLatin1String("S_")
#define QT_BEARERMGMT_CONFIGURATION_IAP_PREFIX QLatin1String("I_")
class CCommsDatabase;
class QEventLoop;
QT_BEGIN_NAMESPACE
class QTimer;
QT_END_NAMESPACE
QT_BEGIN_NAMESPACE
class QNetworkSessionPrivate;
class AccessPointsAvailabilityScanner;
class SymbianNetworkConfigurationPrivate : public QNetworkConfigurationPrivate
{
public:
SymbianNetworkConfigurationPrivate();
~SymbianNetworkConfigurationPrivate();
inline TUint32 numericIdentifier() const
{
QMutexLocker locker(&mutex);
return numericId;
}
inline TUint connectionIdentifier() const
{
QMutexLocker locker(&mutex);
return connectionId;
}
inline QString configMappingName() const
{
QMutexLocker locker(&mutex);
return mappingName;
}
QString mappingName;
// So called IAP id from the platform. Remains constant as long as the
// platform is aware of the configuration ie. it is stored in the databases
// --> does not depend on whether connections are currently open or not.
// In practice is the same for the lifetime of the QNetworkConfiguration.
TUint32 numericId;
// So called connection id, or connection monitor ID. A dynamic ID assigned
// by RConnectionMonitor whenever a new connection is opened. ConnectionID and
// numericId/IAP id have 1-to-1 mapping during the lifetime of the connection at
// connection monitor. Notably however it changes whenever a new connection to
// a given IAP is created. In a sense it is constant during the time the
// configuration remains between states Discovered..Active..Discovered, do not
// however relay on this.
TUint connectionId;
};
inline SymbianNetworkConfigurationPrivate *toSymbianConfig(QNetworkConfigurationPrivatePointer ptr)
{
return static_cast<SymbianNetworkConfigurationPrivate *>(ptr.data());
}
class SymbianEngine : public QBearerEngine, public CActive,
public MConnectionMonitorObserver
{
Q_OBJECT
public:
SymbianEngine(QObject *parent = 0);
virtual ~SymbianEngine();
bool hasIdentifier(const QString &id);
Q_INVOKABLE void initialize();
Q_INVOKABLE void requestUpdate();
QNetworkConfigurationManager::Capabilities capabilities() const;
QNetworkSessionPrivate *createSessionBackend();
QNetworkConfigurationPrivatePointer defaultConfiguration();
QStringList accessPointConfigurationIdentifiers();
QNetworkConfigurationPrivatePointer configurationFromSsid(const QString &ssid);
// For QNetworkSessionPrivateImpl to indicate about state changes
void configurationStateChangeReport(TUint32 accessPointId, QNetworkSession::State newState);
Q_SIGNALS:
void onlineStateChanged(bool isOnline);
void configurationStateChanged(quint32 accessPointId, quint32 connMonId,
QNetworkSession::State newState);
public Q_SLOTS:
void updateConfigurations();
void delayedConfigurationUpdate();
private:
void updateStatesToSnaps();
bool changeConfigurationStateTo(QNetworkConfigurationPrivatePointer ptr,
QNetworkConfiguration::StateFlags newState);
bool changeConfigurationStateAtMinTo(QNetworkConfigurationPrivatePointer ptr,
QNetworkConfiguration::StateFlags newState);
bool changeConfigurationStateAtMaxTo(QNetworkConfigurationPrivatePointer ptr,
QNetworkConfiguration::StateFlags newState);
#ifdef SNAP_FUNCTIONALITY_AVAILABLE
void updateMobileBearerToConfigs(TConnMonBearerInfo bearerInfo);
SymbianNetworkConfigurationPrivate *configFromConnectionMethodL(RCmConnectionMethod& connectionMethod);
#else
bool readNetworkConfigurationValuesFromCommsDb(
TUint32 aApId, SymbianNetworkConfigurationPrivate *apNetworkConfiguration);
void readNetworkConfigurationValuesFromCommsDbL(
TUint32 aApId, SymbianNetworkConfigurationPrivate *apNetworkConfiguration);
#endif
void updateConfigurationsL();
void updateActiveAccessPoints();
void updateAvailableAccessPoints();
void accessPointScanningReady(TBool scanSuccessful, TConnMonIapInfo iapInfo);
void startCommsDatabaseNotifications();
void stopCommsDatabaseNotifications();
void updateConfigurationsAfterRandomTime();
QNetworkConfigurationPrivatePointer defaultConfigurationL();
TBool GetS60PlatformVersion(TUint& aMajor, TUint& aMinor) const;
void startMonitoringIAPData(TUint32 aIapId);
QNetworkConfigurationPrivatePointer dataByConnectionId(TUint aConnectionId);
protected:
// From CActive
void RunL();
void DoCancel();
private:
// MConnectionMonitorObserver
void EventL(const CConnMonEventBase& aEvent);
#ifdef SNAP_FUNCTIONALITY_AVAILABLE
QNetworkConfigurationPrivatePointer configurationFromEasyWlan(TUint32 apId,
TUint connectionId);
#endif
private: // Data
bool iFirstUpdate;
CCommsDatabase* ipCommsDB;
RConnectionMonitor iConnectionMonitor;
TBool iWaitingCommsDatabaseNotifications;
TBool iOnline;
TBool iInitOk;
TBool iUpdateGoingOn;
TBool iUpdatePending;
TBool iScanInQueue;
AccessPointsAvailabilityScanner* ipAccessPointsAvailabilityScanner;
QNetworkConfigurationPrivatePointer defaultConfig;
friend class QNetworkSessionPrivate;
friend class AccessPointsAvailabilityScanner;
#ifdef SNAP_FUNCTIONALITY_AVAILABLE
RCmManager iCmManager;
#endif
};
class AccessPointsAvailabilityScanner : public CActive
{
public:
AccessPointsAvailabilityScanner(SymbianEngine& owner,
RConnectionMonitor& connectionMonitor);
~AccessPointsAvailabilityScanner();
void StartScanning();
protected: // From CActive
void RunL();
void DoCancel();
private: // Data
SymbianEngine& iOwner;
RConnectionMonitor& iConnectionMonitor;
TConnMonIapInfoBuf iIapBuf;
TBool iScanActive;
};
QT_END_NAMESPACE
#endif