From 24789b785b21f19c99d9c214ba1b0f5ece8fd09f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= Date: Mon, 26 Sep 2011 19:43:58 +0200 Subject: And some more occurrences of uintmax_t. 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 #include "QtFileTransferJSBridge.h" +#include #include #include @@ -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 +#include #include #include @@ -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 +#include #include #include @@ -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; -- cgit v0.10.2-6-g49f6