diff -r b5d63d5fc252 -r a469c0e6e7fb smf/smfservermodule/smfserver/transportmgr/smftransportmanager.cpp --- a/smf/smfservermodule/smfserver/transportmgr/smftransportmanager.cpp Mon Jun 07 11:43:45 2010 +0100 +++ b/smf/smfservermodule/smfserver/transportmgr/smftransportmanager.cpp Wed Jun 23 19:51:49 2010 +0530 @@ -26,13 +26,13 @@ // Static data initialisation SmfTransportManager* SmfTransportManager::m_myInstance = NULL; - /** * Method to get the instance of SmfTransportManager class * @return The instance of SmfTransportManager class */ SmfTransportManager* SmfTransportManager::getInstance ( ) { + qDebug()<<("Inside SmfTransportManager::getInstance()"); if(NULL == m_myInstance) m_myInstance = new SmfTransportManager( ); return m_myInstance; @@ -43,16 +43,21 @@ * @param aParent The parent object */ SmfTransportManager::SmfTransportManager ( ) - : m_netwConfigMngr(this), m_systemInfo(this) { + qDebug()<<("Inside SmfTransportManager::SmfTransportManager()"); + + m_systemInfo = new QSystemNetworkInfo(this); + + m_netwConfigMngr = new QNetworkConfigurationManager(this); + // Register for monitoring changes in IAPs (network configurations) - connect(&m_netwConfigMngr, SIGNAL(configurationAdded(const QNetworkConfiguration &)), + connect(m_netwConfigMngr, SIGNAL(configurationAdded(const QNetworkConfiguration &)), this, SLOT(configurationAdded(const QNetworkConfiguration &))); - connect(&m_netwConfigMngr, SIGNAL(configurationChanged(const QNetworkConfiguration &)), + connect(m_netwConfigMngr, SIGNAL(configurationChanged(const QNetworkConfiguration &)), this, SLOT(configurationChanged(const QNetworkConfiguration &))); - connect(&m_netwConfigMngr, SIGNAL(configurationRemoved(const QNetworkConfiguration &)), + connect(m_netwConfigMngr, SIGNAL(configurationRemoved(const QNetworkConfiguration &)), this, SLOT(configurationRemoved(const QNetworkConfiguration &))); } @@ -62,8 +67,16 @@ */ SmfTransportManager::~SmfTransportManager ( ) { + if(m_netwConfigMngr) + delete m_netwConfigMngr; + + if(m_systemInfo) + delete m_systemInfo; + if(m_myInstance) delete m_myInstance; + + m_myInstance = NULL; } @@ -71,19 +84,20 @@ * Method to initialize the transport component before * executing a web query * @return SmfTransportInitializeResult - * @see smfglobal.h */ SmfTransportInitializeResult SmfTransportManager::initializeTransport ( ) { + qDebug()<<"Inside SmfTransportManager::initializeTransport()"; SmfTransportInitializeResult retVal = SmfTransportInitNetworkNotAvailable; if(getNetworkAvailabilty()) { + qDebug()<<"getNetworkAvailabilty() returned true"; retVal = SmfTransportInitNoError; SmfNetworkStatus status; getCurrentNetworkStatus(status); - + qDebug()<<("getCurrentNetworkStatus() returned = "+QString::number(status)); switch(status) { // homenetwork @@ -108,6 +122,10 @@ retVal = SmfTransportInitNetworkNotAvailable; } } + else + qDebug()<<"getNetworkAvailabilty() returned false!!!"; + + qDebug()<<"Return value of SmfTransportManager::initializeTransport() = "<networkStatus(QSystemNetworkInfo::GsmMode); + qDebug()<<"gsm = "<networkStatus(QSystemNetworkInfo::CdmaMode); + qDebug()<<"cdma = "<networkStatus(QSystemNetworkInfo::WcdmaMode); + qDebug()<<"wcdma = "<networkStatus(QSystemNetworkInfo::WlanMode); + qDebug()<<"wlan = "<networkStatus(QSystemNetworkInfo::EthernetMode); + qDebug()<<"ethernet = "<networkStatus(QSystemNetworkInfo::BluetoothMode); + qDebug()<<"bluetooth = "<networkStatus(QSystemNetworkInfo::WimaxMode); + qDebug()<<"wimax = "<isOnline(); + qDebug()<<"m_netwConfigMngr->isOnline() = "< list = m_netwConfigMngr->allConfigurations(); + qDebug()<<"list count = "<networkStatus ( QSystemNetworkInfo::GsmMode ) = "<configurationAdded(SmfTransportOpIAPChanged); } @@ -185,7 +259,7 @@ void SmfTransportManager::configurationChanged ( const QNetworkConfiguration &aConfig ) { - if( aConfig == m_netwConfigMngr.defaultConfiguration() ) + if( aConfig == m_netwConfigMngr->defaultConfiguration() ) SmfTransportManagerUtil::getInstance()->configurationChanged(SmfTransportOpIAPChanged); } @@ -197,7 +271,7 @@ void SmfTransportManager::configurationRemoved ( const QNetworkConfiguration &aConfig ) { - if( aConfig == m_netwConfigMngr.defaultConfiguration() ) + if( aConfig == m_netwConfigMngr->defaultConfiguration() ) SmfTransportManagerUtil::getInstance()->configurationRemoved(SmfTransportOpIAPChanged); }