diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-05 00:51:25 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-08 07:48:22 (GMT) |
| commit | a307e9662c2b57ad16c2329754ea4795615de125 (patch) | |
| tree | 48fe89e1c2edfda1e441a1db760ff63047cc209c /src/plugins/bearer/generic | |
| parent | df4b88078124fe993795bd436f3093b0120ffce2 (diff) | |
| download | Qt-a307e9662c2b57ad16c2329754ea4795615de125.zip Qt-a307e9662c2b57ad16c2329754ea4795615de125.tar.gz Qt-a307e9662c2b57ad16c2329754ea4795615de125.tar.bz2 | |
Remove implementation specific functions out of QNetworkSessionEngine.
Diffstat (limited to 'src/plugins/bearer/generic')
| -rw-r--r-- | src/plugins/bearer/generic/generic.pro | 1 | ||||
| -rw-r--r-- | src/plugins/bearer/generic/qgenericengine.cpp | 14 | ||||
| -rw-r--r-- | src/plugins/bearer/generic/qgenericengine.h | 6 |
3 files changed, 6 insertions, 15 deletions
diff --git a/src/plugins/bearer/generic/generic.pro b/src/plugins/bearer/generic/generic.pro index d039731..dbf96d1 100644 --- a/src/plugins/bearer/generic/generic.pro +++ b/src/plugins/bearer/generic/generic.pro @@ -5,6 +5,7 @@ QT += network HEADERS += qgenericengine.h \ ../qnetworksession_impl.h \ + ../qnetworksessionengine_impl.h \ ../platformdefs_win.h SOURCES += qgenericengine.cpp \ ../qnetworksession_impl.cpp \ diff --git a/src/plugins/bearer/generic/qgenericengine.cpp b/src/plugins/bearer/generic/qgenericengine.cpp index 55d1ae4..dea820d 100644 --- a/src/plugins/bearer/generic/qgenericengine.cpp +++ b/src/plugins/bearer/generic/qgenericengine.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -141,7 +141,7 @@ static QString qGetInterfaceType(const QString &interface) } QGenericEngine::QGenericEngine(QObject *parent) -: QNetworkSessionEngine(parent) +: QNetworkSessionEngineImpl(parent) { connect(&pollTimer, SIGNAL(timeout()), this, SLOT(doRequestUpdate())); pollTimer.setInterval(10000); @@ -162,16 +162,6 @@ bool QGenericEngine::hasIdentifier(const QString &id) return configurationInterface.contains(id); } -/*QString QGenericEngine::bearerName(const QString &id) -{ - QString interface = getInterfaceFromId(id); - - if (interface.isEmpty()) - return QLatin1String("Unknown"); - - return qGetInterfaceType(interface); -}*/ - void QGenericEngine::connectToId(const QString &id) { emit connectionError(id, OperationNotSupported); diff --git a/src/plugins/bearer/generic/qgenericengine.h b/src/plugins/bearer/generic/qgenericengine.h index b44685b..d755228 100644 --- a/src/plugins/bearer/generic/qgenericengine.h +++ b/src/plugins/bearer/generic/qgenericengine.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -42,7 +42,7 @@ #ifndef QGENERICENGINE_H #define QGENERICENGINE_H -#include <QtNetwork/private/qnetworksessionengine_p.h> +#include "../qnetworksessionengine_impl.h" #include <QMap> #include <QTimer> @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QNetworkConfigurationPrivate; class QNetworkSessionPrivate; -class QGenericEngine : public QNetworkSessionEngine +class QGenericEngine : public QNetworkSessionEngineImpl { Q_OBJECT |