- change 'void *' arguments to 'void* ' to match style requirements.

translator:
- add support for const virtual methods. (Issue # 36)
- output const vector argument types as 'struct _class_t* const*' (cons array, non-const members) instead of 'const struct _class_t**' (non-const array, const members) (Issue # 36)
- always add the 'enum' qualifier when outputting C API enum attribute types. (Issue # 38)
- update translated files.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@31 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2009-06-25 15:59:48 +00:00
parent 8a04c0f0c1
commit 0a92d27cc1
22 changed files with 90 additions and 74 deletions

View File

@@ -324,7 +324,7 @@ size_t CefPostDataElementImpl::GetBytesCount()
return size;
}
size_t CefPostDataElementImpl::GetBytes(size_t size, void *bytes)
size_t CefPostDataElementImpl::GetBytes(size_t size, void* bytes)
{
Lock();
DCHECK(type_ == PDE_TYPE_BYTES);

View File

@@ -73,7 +73,7 @@ public:
virtual Type GetType();
virtual std::wstring GetFile();
virtual size_t GetBytesCount();
virtual size_t GetBytes(size_t size, void *bytes);
virtual size_t GetBytes(size_t size, void* bytes);
void Set(const net::UploadData::Element& element);
void Get(net::UploadData::Element& element);

View File

@@ -19,7 +19,7 @@ CefRefPtr<CefStreamReader> CefStreamReader::CreateForFile(const std::wstring& fi
return reader;
}
CefRefPtr<CefStreamReader> CefStreamReader::CreateForData(void *data, size_t size)
CefRefPtr<CefStreamReader> CefStreamReader::CreateForData(void* data, size_t size)
{
DCHECK(data != NULL);
DCHECK(size > 0);
@@ -45,7 +45,7 @@ CefFileReader::~CefFileReader()
Unlock();
}
size_t CefFileReader::Read(void *ptr, size_t size, size_t n)
size_t CefFileReader::Read(void* ptr, size_t size, size_t n)
{
Lock();
size_t rv = fread(ptr, size, n, file_);
@@ -93,7 +93,7 @@ CefFileWriter::~CefFileWriter()
Unlock();
}
size_t CefFileWriter::Write(const void *ptr, size_t size, size_t n)
size_t CefFileWriter::Write(const void* ptr, size_t size, size_t n)
{
Lock();
size_t rv = (size_t)fwrite(ptr, size, n, file_);
@@ -128,7 +128,7 @@ int CefFileWriter::Flush()
// CefBytesReader
CefBytesReader::CefBytesReader(void *data, long datasize, bool copy)
CefBytesReader::CefBytesReader(void* data, long datasize, bool copy)
: data_(NULL), datasize_(0), copy_(false), offset_(0)
{
SetData(data, datasize, copy);
@@ -139,7 +139,7 @@ CefBytesReader::~CefBytesReader()
SetData(NULL, 0, false);
}
size_t CefBytesReader::Read(void *ptr, size_t size, size_t n)
size_t CefBytesReader::Read(void* ptr, size_t size, size_t n)
{
Lock();
size_t s = (datasize_ - offset_) / size;
@@ -197,7 +197,7 @@ int CefBytesReader::Eof()
return rv;
}
void CefBytesReader::SetData(void *data, long datasize, bool copy)
void CefBytesReader::SetData(void* data, long datasize, bool copy)
{
Lock();
if(copy_)
@@ -237,7 +237,7 @@ CefBytesWriter::~CefBytesWriter()
Unlock();
}
size_t CefBytesWriter::Write(const void *ptr, size_t size, size_t n)
size_t CefBytesWriter::Write(const void* ptr, size_t size, size_t n)
{
Lock();
size_t rv;
@@ -309,7 +309,7 @@ size_t CefBytesWriter::Grow(size_t size)
Lock();
size_t rv;
size_t s = (size > grow_ ? size : grow_);
void *tmp = realloc(data_, datasize_ + s);
void* tmp = realloc(data_, datasize_ + s);
DCHECK(tmp != NULL);
if(tmp) {
data_ = tmp;

View File

@@ -15,7 +15,7 @@ public:
CefFileReader(FILE* file, bool close);
~CefFileReader();
virtual size_t Read(void *ptr, size_t size, size_t n);
virtual size_t Read(void* ptr, size_t size, size_t n);
virtual int Seek(long offset, int whence);
virtual long Tell();
virtual int Eof();
@@ -32,7 +32,7 @@ public:
CefFileWriter(FILE* file, bool close);
~CefFileWriter();
virtual size_t Write(const void *ptr, size_t size, size_t n);
virtual size_t Write(const void* ptr, size_t size, size_t n);
virtual int Seek(long offset, int whence);
virtual long Tell();
virtual int Flush();
@@ -46,21 +46,21 @@ protected:
class CefBytesReader : public CefThreadSafeBase<CefStreamReader>
{
public:
CefBytesReader(void *data, long datasize, bool copy);
CefBytesReader(void* data, long datasize, bool copy);
~CefBytesReader();
virtual size_t Read(void *ptr, size_t size, size_t n);
virtual size_t Read(void* ptr, size_t size, size_t n);
virtual int Seek(long offset, int whence);
virtual long Tell();
virtual int Eof();
void SetData(void *data, long datasize, bool copy);
void SetData(void* data, long datasize, bool copy);
void *GetData() { return data_; }
void* GetData() { return data_; }
size_t GetDataSize() { return offset_; }
protected:
void *data_;
void* data_;
size_t datasize_;
bool copy_;
size_t offset_;
@@ -73,12 +73,12 @@ public:
CefBytesWriter(size_t grow);
~CefBytesWriter();
virtual size_t Write(const void *ptr, size_t size, size_t n);
virtual size_t Write(const void* ptr, size_t size, size_t n);
virtual int Seek(long offset, int whence);
virtual long Tell();
virtual int Flush();
void *GetData() { return data_; }
void* GetData() { return data_; }
size_t GetDataSize() { return offset_; }
std::string GetDataString();
@@ -87,7 +87,7 @@ protected:
protected:
size_t grow_;
void *data_;
void* data_;
size_t datasize_;
size_t offset_;
};