forked from mia/Aegisub
Sprinkle const to remove warnings.
Originally committed to SVN as r3461.
This commit is contained in:
parent
89284f5a1c
commit
a02a63c4e5
2 changed files with 5 additions and 5 deletions
|
@ -131,7 +131,7 @@ size_t AegisubCSConv::GetMBNulLen() const {
|
||||||
char outBuff[8];
|
char outBuff[8];
|
||||||
size_t inLen = sizeof(wchar_t);
|
size_t inLen = sizeof(wchar_t);
|
||||||
size_t outLen = sizeof(outBuff);
|
size_t outLen = sizeof(outBuff);
|
||||||
char * inPtr = (char *)nulStr;
|
const char * inPtr = (char *)nulStr;
|
||||||
char * outPtr = outBuff;
|
char * outPtr = outBuff;
|
||||||
|
|
||||||
size_t res = iconv(w2m, &inPtr, &inLen, &outPtr, &outLen);
|
size_t res = iconv(w2m, &inPtr, &inLen, &outPtr, &outLen);
|
||||||
|
@ -211,7 +211,7 @@ size_t AegisubCSConv::FromWChar(char *dst, size_t dstSize, const wchar_t *src, s
|
||||||
/// @param srcSize
|
/// @param srcSize
|
||||||
/// @return
|
/// @return
|
||||||
///
|
///
|
||||||
size_t AegisubCSConv::doConversion(iconv_t cd, char *dst, size_t dstSize, char *src, size_t srcSize) const {
|
size_t AegisubCSConv::doConversion(iconv_t cd, char *dst, size_t dstSize, const char *src, size_t srcSize) const {
|
||||||
if (dstSize > 0) {
|
if (dstSize > 0) {
|
||||||
return iconvWrapper(cd, &src, &srcSize, &dst, &dstSize);
|
return iconvWrapper(cd, &src, &srcSize, &dst, &dstSize);
|
||||||
}
|
}
|
||||||
|
@ -243,7 +243,7 @@ size_t AegisubCSConv::doConversion(iconv_t cd, char *dst, size_t dstSize, char *
|
||||||
/// @param outbytesleft
|
/// @param outbytesleft
|
||||||
/// @return
|
/// @return
|
||||||
///
|
///
|
||||||
size_t AegisubCSConv::iconvWrapper(iconv_t cd, char **inbuf, size_t *inbytesleft,
|
size_t AegisubCSConv::iconvWrapper(iconv_t cd, const char **inbuf, size_t *inbytesleft,
|
||||||
char **outbuf, size_t *outbytesleft) const {
|
char **outbuf, size_t *outbytesleft) const {
|
||||||
|
|
||||||
#if wxUSE_THREADS
|
#if wxUSE_THREADS
|
||||||
|
|
|
@ -106,8 +106,8 @@ private:
|
||||||
/// DOCME
|
/// DOCME
|
||||||
bool enableSubst;
|
bool enableSubst;
|
||||||
|
|
||||||
size_t doConversion(iconv_t cd, char *dst, size_t dstSize, char *src, size_t srcSize) const;
|
size_t doConversion(iconv_t cd, char *dst, size_t dstSize, const char *src, size_t srcSize) const;
|
||||||
size_t iconvWrapper(iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) const;
|
size_t iconvWrapper(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) const;
|
||||||
|
|
||||||
static void ucToMbFallback(
|
static void ucToMbFallback(
|
||||||
unsigned int code,
|
unsigned int code,
|
||||||
|
|
Loading…
Reference in a new issue