summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer/nla
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-05 00:51:25 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-08 07:48:22 (GMT)
commita307e9662c2b57ad16c2329754ea4795615de125 (patch)
tree48fe89e1c2edfda1e441a1db760ff63047cc209c /src/plugins/bearer/nla
parentdf4b88078124fe993795bd436f3093b0120ffce2 (diff)
downloadQt-a307e9662c2b57ad16c2329754ea4795615de125.zip
Qt-a307e9662c2b57ad16c2329754ea4795615de125.tar.gz
Qt-a307e9662c2b57ad16c2329754ea4795615de125.tar.bz2
Remove implementation specific functions out of QNetworkSessionEngine.
Diffstat (limited to 'src/plugins/bearer/nla')
-rw-r--r--src/plugins/bearer/nla/nla.pro4
-rw-r--r--src/plugins/bearer/nla/qnlaengine.cpp4
-rw-r--r--src/plugins/bearer/nla/qnlaengine.h7
3 files changed, 9 insertions, 6 deletions
diff --git a/src/plugins/bearer/nla/nla.pro b/src/plugins/bearer/nla/nla.pro
index 9bd3526..4c5e492 100644
--- a/src/plugins/bearer/nla/nla.pro
+++ b/src/plugins/bearer/nla/nla.pro
@@ -11,7 +11,9 @@ QT += network
HEADERS += qnlaengine.h \
../platformdefs_win.h \
- ../qnetworksession_impl.h
+ ../qnetworksession_impl.h \
+ ../qnetworksessionengine_impl.h
+
SOURCES += main.cpp \
qnlaengine.cpp \
../qnetworksession_impl.cpp
diff --git a/src/plugins/bearer/nla/qnlaengine.cpp b/src/plugins/bearer/nla/qnlaengine.cpp
index 0ed62e3..ed802c0 100644
--- a/src/plugins/bearer/nla/qnlaengine.cpp
+++ b/src/plugins/bearer/nla/qnlaengine.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)
**
@@ -506,7 +506,7 @@ void QNlaThread::fetchConfigurations()
}
QNlaEngine::QNlaEngine(QObject *parent)
-: QNetworkSessionEngine(parent), nlaThread(0)
+: QNetworkSessionEngineImpl(parent), nlaThread(0)
{
nlaThread = new QNlaThread(this);
connect(nlaThread, SIGNAL(networksChanged()),
diff --git a/src/plugins/bearer/nla/qnlaengine.h b/src/plugins/bearer/nla/qnlaengine.h
index 515a13c..fa010b9 100644
--- a/src/plugins/bearer/nla/qnlaengine.h
+++ b/src/plugins/bearer/nla/qnlaengine.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)
**
@@ -53,7 +53,8 @@
// We mean it.
//
-#include <QtNetwork/private/qnetworksessionengine_p.h>
+#include "../qnetworksessionengine_impl.h"
+
#include <QtNetwork/private/qnativesocketengine_p.h>
#include <QMap>
@@ -71,7 +72,7 @@ public:
int version;
};
-class QNlaEngine : public QNetworkSessionEngine
+class QNlaEngine : public QNetworkSessionEngineImpl
{
Q_OBJECT