summaryrefslogtreecommitdiffstats
path: root/src/kvilib/core/kvi_string.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/kvilib/core/kvi_string.cpp')
-rw-r--r--src/kvilib/core/kvi_string.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp
index 9e491ccb..0d0b1750 100644
--- a/src/kvilib/core/kvi_string.cpp
+++ b/src/kvilib/core/kvi_string.cpp
@@ -98,7 +98,7 @@ kvi_wslen_t kvi_wstrlen(const kvi_wchar_t * str)
{ \
KviStr * pString = kvi_va_arg(list,KviStr *); \
char * argString = pString->ptr(); \
- if(len <= ((int)(pString->len())))return (-1); \
+ if(len <= static_cast<kvi_wslen_t>(pString->len()))return (-1); \
while(*argString)*p++ = *argString++; \
len -= pString->len(); \
} \
@@ -108,7 +108,7 @@ kvi_wslen_t kvi_wstrlen(const kvi_wchar_t * str)
TQString * pString = kvi_va_arg(list,TQString *); \
if(pString->length() > 0) \
{ \
- if(len <= ((int)(pString->length())))return (-1); \
+ if(len <= static_cast<kvi_wslen_t>(pString->length()))return (-1); \
_WSTRING_WMEMCPY(p,pString->unicode(),pString->length()); \
p += pString->length(); \
len -= pString->length(); \
@@ -711,7 +711,7 @@ int kvi_vsnprintf(char *buffer,int len,const char *fmt,kvi_va_list list)
} while((argValue = tmp));
//copy now....
argUValue = pNumBuf - numberBuffer; //length of the number string
- if(((uint)len) <= argUValue)return (-1); //not enough space for number and terminator
+ if(((unsigned int)len) <= argUValue)return (-1); //not enough space for number and terminator
do { *p++ = *--pNumBuf; } while(pNumBuf != numberBuffer);
len -= argUValue;
continue;
@@ -2118,7 +2118,7 @@ KviStr & KviStr::replaceAll(char c,const char *str)
return (*this);
}
-KviStr & KviStr::replaceAll(char *toFind,const char *str,bool bCaseS)
+KviStr & KviStr::replaceAll(const char *toFind,const char *str,bool bCaseS)
{
int len = (int)strlen(toFind);
int idx = findFirstIdx(toFind,bCaseS);