diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-09-16 13:49:26 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-09-16 14:52:40 +0200 |
| commit | 8c6755aeec312ae771ef334fc863642514db3f7c (patch) | |
| tree | 3ccec405ee35690bdb7def6c0a3c42866bd9adc2 /examples/network/torrent | |
| parent | 104debb6627d71f5540bb2c3347ce56dddc63594 (diff) | |
| parent | c40a48af997f57caa0ecfca0b247837ba5b2f89b (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: Ifc6cd3a0f1cf14cc0fe6cf30afb0c7f40cfdbc3e
Diffstat (limited to 'examples/network/torrent')
| -rw-r--r-- | examples/network/torrent/peerwireclient.cpp | 1 | ||||
| -rw-r--r-- | examples/network/torrent/torrentclient.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/examples/network/torrent/peerwireclient.cpp b/examples/network/torrent/peerwireclient.cpp index 0f77ba10d3..a0be01d363 100644 --- a/examples/network/torrent/peerwireclient.cpp +++ b/examples/network/torrent/peerwireclient.cpp @@ -49,7 +49,6 @@ static const int ConnectTimeout = 60 * 1000; static const int KeepAliveInterval = 30 * 1000; static const int RateControlTimerDelay = 2000; static const int MinimalHeaderSize = 48; -static const int FullHeaderSize = 68; static const char ProtocolId[] = "BitTorrent protocol"; static const char ProtocolIdSize = 19; diff --git a/examples/network/torrent/torrentclient.cpp b/examples/network/torrent/torrentclient.cpp index f0f47fe884..356dc21a1f 100644 --- a/examples/network/torrent/torrentclient.cpp +++ b/examples/network/torrent/torrentclient.cpp @@ -64,7 +64,6 @@ static const int RateControlTimerDelay = 1000; static const int MinimumTimeBeforeRevisit = 30; static const int MaxUploads = 4; static const int UploadScheduleInterval = 10000; -static const int EndGamePieces = 5; class TorrentPiece { public: |