mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

int32 => int32_t

Browse source
This commit is contained in:
Paul Betts 2016-03-07 20:40:10 -08:00 • committed by Cheng Zhao
parent d2944c62a5
commit 4503aafe64
11 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/common/api/atom_api_clipboard.cc
View file

@ -109,8 +109,8 @@ base::string16 ReadHtml(mate::Arguments* args) {
base::string16 data;
base::string16 html;
std::string url;
uint32 start;
uint32 end;
uint32_t start;
uint32_t end;
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
clipboard->ReadHTML(GetClipboardType(args), &html, &url, &start, &end);
data = html.substr(start, end - start);

8
atom/common/asar/archive.cc
View file

@ -90,12 +90,12 @@ bool GetNodeFromPath(std::string path,
}
bool FillFileInfoWithNode(Archive::FileInfo* info,
uint32 header_size,
uint32_t header_size,
const base::DictionaryValue* node) {
int size;
if (!node->GetInteger("size", &size))
return false;
info->size = static_cast<uint32>(size);
info->size = static_cast<uint32_t>(size);
if (node->GetBoolean("unpacked", &info->unpacked) && info->unpacked)
return true;
@ -157,8 +157,8 @@ bool Archive::Init() {
return false;
}
uint32 size;
if (!base::PickleIterator(base::Pickle(buf.data(), buf.size())).ReadUInt32(
uint32_t size;
if (!base::PickleIterator(base::Pickle(buf.data(), buf.size())).ReadUint32_t(
&size)) {
LOG(ERROR) << "Failed to parse header size from " << path_.value();
return false;

4
atom/common/asar/archive.h
View file

@ -28,7 +28,7 @@ class Archive {
FileInfo() : unpacked(false), executable(false), size(0), offset(0) {}
bool unpacked;
bool executable;
uint32 size;
uint32_t size;
uint64 offset;
};
@ -71,7 +71,7 @@ class Archive {
base::FilePath path_;
base::File file_;
int fd_;
uint32 header_size_;
uint32_t header_size_;
scoped_ptr<base::DictionaryValue> header_;
// Cached external temporary files.

10
atom/common/native_mate_converters/v8_value_converter.cc
View file

@ -169,7 +169,7 @@ v8::Local<v8::Value> V8ValueConverter::ToV8Array(
CHECK(!child_v8.IsEmpty());
v8::TryCatch try_catch;
result->Set(static_cast<uint32>(i), child_v8);
result->Set(static_cast<uint32_t>(i), child_v8);
if (try_catch.HasCaught())
LOG(ERROR) << "Setter for index " << i << " threw an exception.";
}
@ -222,8 +222,8 @@ base::Value* V8ValueConverter::FromV8ValueImpl(
if (val->IsBoolean())
return new base::FundamentalValue(val->ToBoolean()->Value());
if (val->IsInt32())
return new base::FundamentalValue(val->ToInt32()->Value());
if (val->Isint32_t())
return new base::FundamentalValue(val->Toint32_t()->Value());
if (val->IsNumber())
return new base::FundamentalValue(val->ToNumber()->Value());
@ -298,7 +298,7 @@ base::Value* V8ValueConverter::FromV8Array(
base::ListValue* result = new base::ListValue();
// Only fields with integer keys are carried over to the ListValue.
for (uint32 i = 0; i < val->Length(); ++i) {
for (uint32_t i = 0; i < val->Length(); ++i) {
v8::TryCatch try_catch;
v8::Local<v8::Value> child_v8 = val->Get(i);
if (try_catch.HasCaught()) {
@ -345,7 +345,7 @@ base::Value* V8ValueConverter::FromV8Object(
scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());
v8::Local<v8::Array> property_names(val->GetOwnPropertyNames());
for (uint32 i = 0; i < property_names->Length(); ++i) {
for (uint32_t i = 0; i < property_names->Length(); ++i) {
v8::Local<v8::Value> key(property_names->Get(i));
// Extend this test to cover more types as necessary and if sensible.