1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the useless connManager() function.

Browse Source 
Change-Id: Ifac0796ec22d0656ccfcf31b8d45b2342c2ee646
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Xizhi Zhu 2012-01-19 14:27:10 +01:00 committed by Qt by Nokia
parent ce14c36475
commit 3c0777936e
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/network/bearer/qnetworkconfigmanager.cpp
View File

@ -69,7 +69,7 @@ void QNetworkConfigurationManagerPrivate::addPostRoutine()
qAddPostRoutine(connManager_cleanup); qAddPostRoutine(connManager_cleanup);
} }
static QNetworkConfigurationManagerPrivate *connManager() QNetworkConfigurationManagerPrivate *qNetworkConfigurationManagerPrivate()
{ {
QNetworkConfigurationManagerPrivate *ptr = connManager_ptr.loadAcquire(); QNetworkConfigurationManagerPrivate *ptr = connManager_ptr.loadAcquire();
if (!ptr) { if (!ptr) {
@ -96,11 +96,6 @@ static QNetworkConfigurationManagerPrivate *connManager()
return ptr; return ptr;
} }
QNetworkConfigurationManagerPrivate *qNetworkConfigurationManagerPrivate()
{
return connManager();
}
/*! /*!
\class QNetworkConfigurationManager \class QNetworkConfigurationManager
@ -246,7 +241,7 @@ QNetworkConfigurationManager::QNetworkConfigurationManager(QObject *parent)
*/ */
QNetworkConfigurationManager::~QNetworkConfigurationManager() QNetworkConfigurationManager::~QNetworkConfigurationManager()
{ {
QNetworkConfigurationManagerPrivate *priv = connManager(); QNetworkConfigurationManagerPrivate *priv = qNetworkConfigurationManagerPrivate();
if (priv) if (priv)
priv->disablePolling(); priv->disablePolling();
} }
@ -263,7 +258,7 @@ QNetworkConfigurationManager::~QNetworkConfigurationManager()
*/ */
QNetworkConfiguration QNetworkConfigurationManager::defaultConfiguration() const QNetworkConfiguration QNetworkConfigurationManager::defaultConfiguration() const
{ {
QNetworkConfigurationManagerPrivate *priv = connManager(); QNetworkConfigurationManagerPrivate *priv = qNetworkConfigurationManagerPrivate();
if (priv) if (priv)
return priv->defaultConfiguration(); return priv->defaultConfiguration();
@ -297,7 +292,7 @@ QNetworkConfiguration QNetworkConfigurationManager::defaultConfiguration() const
*/ */
QList<QNetworkConfiguration> QNetworkConfigurationManager::allConfigurations(QNetworkConfiguration::StateFlags filter) const QList<QNetworkConfiguration> QNetworkConfigurationManager::allConfigurations(QNetworkConfiguration::StateFlags filter) const
{ {
QNetworkConfigurationManagerPrivate *priv = connManager(); QNetworkConfigurationManagerPrivate *priv = qNetworkConfigurationManagerPrivate();
if (priv) if (priv)
return priv->allConfigurations(filter); return priv->allConfigurations(filter);
@ -312,7 +307,7 @@ QList<QNetworkConfiguration> QNetworkConfigurationManager::allConfigurations(QNe
*/ */
QNetworkConfiguration QNetworkConfigurationManager::configurationFromIdentifier(const QString &identifier) const QNetworkConfiguration QNetworkConfigurationManager::configurationFromIdentifier(const QString &identifier) const
{ {
QNetworkConfigurationManagerPrivate *priv = connManager(); QNetworkConfigurationManagerPrivate *priv = qNetworkConfigurationManagerPrivate();
if (priv) if (priv)
return priv->configurationFromIdentifier(identifier); return priv->configurationFromIdentifier(identifier);
@ -331,7 +326,7 @@ QNetworkConfiguration QNetworkConfigurationManager::configurationFromIdentifier(
*/ */
bool QNetworkConfigurationManager::isOnline() const bool QNetworkConfigurationManager::isOnline() const
{ {
QNetworkConfigurationManagerPrivate *priv = connManager(); QNetworkConfigurationManagerPrivate *priv = qNetworkConfigurationManagerPrivate();
if (priv) if (priv)
return priv->isOnline(); return priv->isOnline();
@ -343,7 +338,7 @@ bool QNetworkConfigurationManager::isOnline() const
*/ */
QNetworkConfigurationManager::Capabilities QNetworkConfigurationManager::capabilities() const QNetworkConfigurationManager::Capabilities QNetworkConfigurationManager::capabilities() const
{ {
QNetworkConfigurationManagerPrivate *priv = connManager(); QNetworkConfigurationManagerPrivate *priv = qNetworkConfigurationManagerPrivate();
if (priv) if (priv)
return priv->capabilities(); return priv->capabilities();
@ -366,7 +361,7 @@ QNetworkConfigurationManager::Capabilities QNetworkConfigurationManager::capabil
*/ */
void QNetworkConfigurationManager::updateConfigurations() void QNetworkConfigurationManager::updateConfigurations()
{ {
QNetworkConfigurationManagerPrivate *priv = connManager(); QNetworkConfigurationManagerPrivate *priv = qNetworkConfigurationManagerPrivate();
if (priv) if (priv)
priv->performAsyncConfigurationUpdate(); priv->performAsyncConfigurationUpdate();
} }