diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2009-12-11 02:45:40 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-04 01:16:56 (GMT) |
| commit | 33ff53925ba6d62ecc868920c6bc914824feec54 (patch) | |
| tree | 6941ae54bed3abe19d6b051cf133856f1d2bb13f /src/network/bearer/qnetworksession_p.h | |
| parent | a60b9d95fddb75a53cde258dbf4b9063a58a88b8 (diff) | |
| download | Qt-33ff53925ba6d62ecc868920c6bc914824feec54.zip Qt-33ff53925ba6d62ecc868920c6bc914824feec54.tar.gz Qt-33ff53925ba6d62ecc868920c6bc914824feec54.tar.bz2 | |
Remove unused BEARER_ENGINE preprocessor define.
Diffstat (limited to 'src/network/bearer/qnetworksession_p.h')
| -rw-r--r-- | src/network/bearer/qnetworksession_p.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h index 0e11b3d..0a45c92 100644 --- a/src/network/bearer/qnetworksession_p.h +++ b/src/network/bearer/qnetworksession_p.h @@ -55,9 +55,7 @@ #include "qnetworkconfigmanager_p.h" #include "qnetworksession.h" -#ifdef BEARER_ENGINE #include "qnetworksessionengine_p.h" -#endif #include "qnetworksession.h" #include <QNetworkInterface> @@ -65,9 +63,7 @@ QT_BEGIN_NAMESPACE -#ifdef BEARER_ENGINE class QNetworkSessionEngine; -#endif class QNetworkSessionPrivate : public QObject { @@ -117,12 +113,10 @@ Q_SIGNALS: void quitPendingWaitsForOpened(); private Q_SLOTS: -#ifdef BEARER_ENGINE void networkConfigurationsChanged(); void configurationChanged(const QNetworkConfiguration &config); void forcedSessionClose(const QNetworkConfiguration &config); void connectionError(const QString &id, QNetworkSessionEngine::ConnectionError error); -#endif private: QNetworkConfigurationManager manager; @@ -146,17 +140,16 @@ private: QNetworkSession::State state; bool isActive; -#ifdef BEARER_ENGINE bool opened; QNetworkSessionEngine *engine; -#endif + QNetworkSession::SessionError lastError; QNetworkSession* q; friend class QNetworkSession; -#if defined(BEARER_ENGINE) && defined(BACKEND_NM) +#if defined(BACKEND_NM) QDateTime startTime; void setActiveTimeStamp(); #endif |