--- a/nettools/conntest/Engine/HttpHandler.cpp Wed Sep 15 11:52:39 2010 +0300
+++ b/nettools/conntest/Engine/HttpHandler.cpp Wed Oct 13 14:11:18 2010 +0300
@@ -382,10 +382,7 @@
void CHttpClient::DisplayTimeElapsed()
{
// Throughput calculation
- TUint64 packets = iSettingData->iPackets;
- TUint64 packetSize = iSettingData->iPacketSize;
- TUint64 size = packets*packetSize;
-
+ TInt size = OverallDataSize();
TBuf8<128> b(_L8("Body sent\n"));
Utils::CalculateThroughput(b, iLastTimeStamp, size);
--- a/nettools/conntest/data/ConnTest_reg.rss Wed Sep 15 11:52:39 2010 +0300
+++ b/nettools/conntest/data/ConnTest_reg.rss Wed Oct 13 14:11:18 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -16,7 +16,7 @@
*/
#include <appinfo.rh>
-#include <conntest.rsg>
+#include <ConnTest.rsg>
UID2 KUidAppRegistrationResourceFile
UID3 0x101F6D2B // application UID
--- a/nettools/conntest/group/ConnTest.mmp Wed Sep 15 11:52:39 2010 +0300
+++ b/nettools/conntest/group/ConnTest.mmp Wed Oct 13 14:11:18 2010 +0300
@@ -76,7 +76,7 @@
LIBRARY apparc.lib
LIBRARY apgrfx.lib
LIBRARY avkon.lib
-LIBRARY aknskins.lib
+LIBRARY AknSkins.lib
LIBRARY aknnotify.lib
LIBRARY bafl.lib
LIBRARY commdb.lib
--- a/nettools/conntest/inc/HttpHandler.h Wed Sep 15 11:52:39 2010 +0300
+++ b/nettools/conntest/inc/HttpHandler.h Wed Oct 13 14:11:18 2010 +0300
@@ -159,7 +159,7 @@
MHTTPDataSupplier* iRespBody;
MUINotify& iConsole; // console for displaying text etc
TTime iStartTime;
- TUint64 iBodySize;
+ TInt iBodySize;
TBool iDoPerformance;
};
--- a/nettools/conntest/inc/SocketsEngine.h Wed Sep 15 11:52:39 2010 +0300
+++ b/nettools/conntest/inc/SocketsEngine.h Wed Oct 13 14:11:18 2010 +0300
@@ -402,7 +402,7 @@
TUint32 iStartTime; // for performance testing only
TTime iStartTTime; // for performance testing only
TTime iThroughputStartTime; // for performance testing only
- TUint64 iTroughputDataSize;
+ TInt iTroughputDataSize;
TCommDbConnPref iPrefs;
TConnPrefList* iPrefsList;
TExtendedConnPref* iExtPrefs;
--- a/nettools/conntest/inc/SocketsRead.h Wed Sep 15 11:52:39 2010 +0300
+++ b/nettools/conntest/inc/SocketsRead.h Wed Oct 13 14:11:18 2010 +0300
@@ -126,7 +126,7 @@
MUINotify& iConsole; // console for displaying text etc
TBuf8<KReadDataSize> iBuffer; // buffer for receiving data
TSockXfrLength iDummyLength; // dummy - length of data read is written here
- TUint64 iReceivedBytes;
+ TInt iReceivedBytes;
TInt32 iUdpPacketCounter;
TBool iDoCount;
TBool iDoPerformance;
--- a/nettools/conntest/inc/SocketsWrite.h Wed Sep 15 11:52:39 2010 +0300
+++ b/nettools/conntest/inc/SocketsWrite.h Wed Oct 13 14:11:18 2010 +0300
@@ -160,7 +160,7 @@
TUint iProtocol;
TInt iPackets;
TInt iPacketSize;
- TUint64 iSentBytes;
+ TInt iSentBytes;
TTime iStartTime;
TInt iDataChunkCount;
HBufC8* iReqBodySubmitBuffer;
--- a/nettools/conntest/inc/Utils.h Wed Sep 15 11:52:39 2010 +0300
+++ b/nettools/conntest/inc/Utils.h Wed Oct 13 14:11:18 2010 +0300
@@ -42,7 +42,7 @@
/**
* Calculate throughput
*/
- static void CalculateThroughput(TDes8& aBuffer, TTime aStartTime, TUint64 aSize);
+ static void CalculateThroughput(TDes8& aBuffer, TTime aStartTime, TInt aSize);
/**
* Set IapId value into connection preferences table.
--- a/nettools/conntest/src/ConnTestAppUi.cpp Wed Sep 15 11:52:39 2010 +0300
+++ b/nettools/conntest/src/ConnTestAppUi.cpp Wed Oct 13 14:11:18 2010 +0300
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -26,7 +26,7 @@
#include "ConnTestAppUi.h"
#include "ConnTestView.h"
-#include <conntest.rsg>
+#include <ConnTest.rsg>
#include "conntest.hrh"
#include "SettingData.h"
#include "ipdumpengine.h"
--- a/nettools/conntest/src/ConnTestView.cpp Wed Sep 15 11:52:39 2010 +0300
+++ b/nettools/conntest/src/ConnTestView.cpp Wed Oct 13 14:11:18 2010 +0300
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -22,7 +22,7 @@
#include <avkon.hrh>
#include <AknGlobalNote.h>
-#include <conntest.rsg>
+#include <ConnTest.rsg>
#include "ConnTestView.h"
#include "ConnTestContainer.h"
#include "CustomPrefsItemList.h"
--- a/nettools/conntest/src/Utils.cpp Wed Sep 15 11:52:39 2010 +0300
+++ b/nettools/conntest/src/Utils.cpp Wed Oct 13 14:11:18 2010 +0300
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include <commdb.h>
#include <aknlistquerydialog.h>
-#include <conntest.rsg>
+#include <ConnTest.rsg>
#include <aknselectionlist.h>
#include <aknPopup.h>
@@ -57,13 +57,13 @@
// Calculate throughput
// ----------------------------------------------------------------------------
//
-void Utils::CalculateThroughput( TDes8& aBuffer, TTime aStartTime, TUint64 aSize )
+void Utils::CalculateThroughput( TDes8& aBuffer, TTime aStartTime, TInt aSize )
{
TTime now;
now.UniversalTime();
TTimeIntervalMicroSeconds interval;
interval = now.MicroSecondsFrom( aStartTime );
- TUint64 num = interval.Int64();
+ TInt num = I64INT(interval.Int64());
if (num != 0)
{