summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-09-26 17:43:58 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-09-26 17:43:58 (GMT)
commit24789b785b21f19c99d9c214ba1b0f5ece8fd09f (patch)
tree5b89b8f8f2771638ec841981be0b17743e28d7cd
parentb18472bb908a525f38974140c20e08492853855c (diff)
downloadswift-24789b785b21f19c99d9c214ba1b0f5ece8fd09f.zip
swift-24789b785b21f19c99d9c214ba1b0f5ece8fd09f.tar.bz2
And some more occurrences of uintmax_t.
-rw-r--r--Swift/QtUI/QtChatWindow.cpp3
-rw-r--r--Swift/QtUI/QtFileTransferListItemModel.cpp3
-rw-r--r--Swiften/FileTransfer/IncomingJingleFileTransfer.h3
3 files changed, 6 insertions, 3 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index 760e481..e188e6a 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -23,6 +23,7 @@
#include <Swift/Controllers/UIEvents/SendFileUIEvent.h>
#include "QtFileTransferJSBridge.h"
+#include <boost/cstdint.hpp>
#include <boost/format.hpp>
#include <boost/lexical_cast.hpp>
@@ -471,7 +472,7 @@ std::string QtChatWindow::addAction(const std::string &message, const std::strin
return addMessage(" *" + message + "*", senderName, senderIsSelf, label, avatarPath, "font-style:italic ", time);
}
-std::string formatSize(const uintmax_t bytes) {
+std::string formatSize(const boost::uintmax_t bytes) {
static const char *siPrefix[] = {"k", "M", "G", "T", "P", "E", "Z", "Y", NULL};
int power = 0;
double engBytes = bytes;
diff --git a/Swift/QtUI/QtFileTransferListItemModel.cpp b/Swift/QtUI/QtFileTransferListItemModel.cpp
index 1b8ec51..63dd45a 100644
--- a/Swift/QtUI/QtFileTransferListItemModel.cpp
+++ b/Swift/QtUI/QtFileTransferListItemModel.cpp
@@ -7,6 +7,7 @@
#include "QtFileTransferListItemModel.h"
#include <boost/bind.hpp>
+#include <boost/cstdint.hpp>
#include <Swiften/Base/boost_bsignals.h>
#include <Swift/Controllers/FileTransfer/FileTransferController.h>
@@ -14,7 +15,7 @@
namespace Swift {
-extern std::string formatSize(const uintmax_t bytes);
+extern std::string formatSize(const boost::uintmax_t bytes);
QtFileTransferListItemModel::QtFileTransferListItemModel(QObject *parent) : QAbstractItemModel(parent), fileTransferOverview(0) {
}
diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.h b/Swiften/FileTransfer/IncomingJingleFileTransfer.h
index 4ae0d1d..9e77de7 100644
--- a/Swiften/FileTransfer/IncomingJingleFileTransfer.h
+++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.h
@@ -7,6 +7,7 @@
#pragma once
#include <boost/shared_ptr.hpp>
+#include <boost/cstdint.hpp>
#include <Swiften/Base/IDGenerator.h>
#include <Swiften/Network/Timer.h>
@@ -104,7 +105,7 @@ namespace Swift {
State state;
JingleFileTransferDescription::ref description;
WriteBytestream::ref stream;
- uintmax_t receivedBytes;
+ boost::uintmax_t receivedBytes;
IncrementalBytestreamHashCalculator* hashCalculator;
Timer::ref waitOnHashTimer;
IDGenerator idGenerator;