diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-06-10 04:31:01 (GMT) |
---|---|---|
committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-06-24 02:27:38 (GMT) |
commit | 91ff19ea3233310f5db542e880661d1efe0151e2 (patch) | |
tree | cbd09885f742e3ffef48a034a3712d6b7056538f /tests/manual/bearerex/bearerex.h | |
parent | 793fbbbf5ae3860b5091c760b3cd0d467369cc1a (diff) | |
download | Qt-91ff19ea3233310f5db542e880661d1efe0151e2.zip Qt-91ff19ea3233310f5db542e880661d1efe0151e2.tar.gz Qt-91ff19ea3233310f5db542e880661d1efe0151e2.tar.bz2 |
Cherry pick fix for MOBILITY-938 from Qt Mobility.
216f4016d1b447d51630086afca179df11fd6997
Diffstat (limited to 'tests/manual/bearerex/bearerex.h')
-rw-r--r-- | tests/manual/bearerex/bearerex.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tests/manual/bearerex/bearerex.h b/tests/manual/bearerex/bearerex.h index 6bcb3e5..b81d486 100644 --- a/tests/manual/bearerex/bearerex.h +++ b/tests/manual/bearerex/bearerex.h @@ -55,13 +55,16 @@ #endif #include "qnetworkconfigmanager.h" #include "qnetworksession.h" +#include "datatransferer.h" #include "xqlistwidget.h" QT_BEGIN_NAMESPACE -class QHttp; +class QNetworkAccessManager; +class QNetworkReply; QT_END_NAMESPACE class SessionTab; +class DataTransferer; QT_USE_NAMESPACE @@ -113,14 +116,15 @@ public: QString stateString(QNetworkSession::State state); private Q_SLOTS: - void on_createQHttpButton_clicked(); + void on_createQNetworkAccessManagerButton_clicked(); void on_sendRequestButton_clicked(); void on_openSessionButton_clicked(); void on_closeSessionButton_clicked(); void on_stopConnectionButton_clicked(); void on_deleteSessionButton_clicked(); + void on_dataObjectChanged(const QString& newObjectType); void on_alrButton_clicked(); - void done(bool error); + void finished(quint32 errorCode, qint64 dataReceived, QString errorType); void newConfigurationActivated(); void preferredConfigurationChanged(const QNetworkConfiguration& config, bool isSeamless); @@ -131,13 +135,14 @@ private Q_SLOTS: void error(QNetworkSession::SessionError error); private: //data - QHttp* m_http; + // QNetworkAccessManager* m_networkAccessManager; + DataTransferer* m_dataTransferer; QNetworkSession* m_NetworkSession; QNetworkConfigurationManager* m_ConfigManager; QListWidget* m_eventListWidget; QNetworkConfiguration m_config; int m_index; - bool m_httpRequestOngoing; + bool m_dataTransferOngoing; bool m_alrEnabled; }; |