Skip to content

Commit

Permalink
Refactoring: use size_t for QCString input parameters instead of uint
Browse files Browse the repository at this point in the history
  • Loading branch information
@doxygen
doxygen committed Aug 8, 2021
1 parent 457cc69 commit f0218cd
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 39 deletions.
8 changes: 4 additions & 4 deletions src/doctokenizer.l
View file
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,8 @@ LINENR {BLANK}*[1-9][0-9]*
<St_Para>^{LISTITEM} { /* list item */
lineCount(yytext,yyleng);
QCString text(yytext);
size_t dashPos = static_cast<size_t>(text.findRev('-'));
assert(dashPos!=std::string::npos);
uint dashPos = static_cast<uint>(text.findRev('-'));
assert(dashPos!=static_cast<uint>(-1));
yyextra->token->isEnumList = text.at(dashPos+1)=='#';
yyextra->token->id = -1;
yyextra->token->indent = computeIndent(yytext,dashPos);
Expand Down Expand Up @@ -417,8 +417,8 @@ LINENR {BLANK}*[1-9][0-9]*
<St_Para>{BLANK}*(\n|"\\ilinebr"){LISTITEM} { /* list item on next line */
lineCount(yytext,yyleng);
QCString text=extractPartAfterNewLine(QCString(yytext));
size_t dashPos = static_cast<size_t>(text.findRev('-'));
assert(dashPos!=std::string::npos);
uint dashPos = static_cast<uint>(text.findRev('-'));
assert(dashPos!=static_cast<uint>(-1));
yyextra->token->isEnumList = text.at(dashPos+1)=='#';
yyextra->token->id = -1;
yyextra->token->indent = computeIndent(text.data(),dashPos);
Expand Down
1 change: 1 addition & 0 deletions src/memberlist.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class MemberVector
const_reference front() const { return m_members.front(); }
const_reference back() const { return m_members.back(); }
const_reference operator[](int index) const { return m_members[index]; }
const_reference operator[](size_t index) const { return m_members[index]; }

static bool lessThan(const MemberDef *md1,const MemberDef *md2)
{
Expand Down
8 changes: 4 additions & 4 deletions src/qcstring.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ QCString QCString::simplifyWhiteSpace() const
return result;
}

QCString &QCString::replace( uint index, uint len, const char *s)
QCString &QCString::replace( size_t index, size_t len, const char *s)
{
remove( index, len );
insert( index, s );
Expand Down Expand Up @@ -394,7 +394,7 @@ uint64 QCString::toUInt64(bool *ok,int base) const

//-------------------------------------------------

void *qmemmove( void *dst, const void *src, uint len )
void *qmemmove( void *dst, const void *src, size_t len )
{
char *d;
char *s;
Expand All @@ -420,7 +420,7 @@ char *qstrdup( const char *str )
return strcpy( dst, str );
}

char *qstrncpy( char *dst, const char *src, uint len )
char *qstrncpy( char *dst, const char *src, size_t len )
{
if ( !src )
return 0;
Expand All @@ -444,7 +444,7 @@ int qstricmp( const char *str1, const char *str2 )
return res;
}

int qstrnicmp( const char *str1, const char *str2, uint len )
int qstrnicmp( const char *str1, const char *str2, size_t len )
{
const uchar *s1 = (const uchar *)str1;
const uchar *s2 = (const uchar *)str2;
Expand Down
62 changes: 31 additions & 31 deletions src/qcstring.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ typedef uint64_t uint64;
Safe and portable C string functions; extensions to standard string.h
*****************************************************************************/

void *qmemmove( void *dst, const void *src, uint len );
void *qmemmove( void *dst, const void *src, size_t len );

#if defined(_OS_WIN32_)
#define qsnprintf _snprintf
Expand All @@ -71,7 +71,7 @@ inline char *cstrcpy( char *dst, const char *src )
inline char *qstrcpy( char *dst, const char *src )
{ return src ? strcpy(dst, src) : 0; }

char * qstrncpy(char *dst,const char *src, uint len);
char * qstrncpy(char *dst,const char *src, size_t len);

inline int cstrcmp( const char *str1, const char *str2 )
{ return strcmp(str1,str2); }
Expand All @@ -85,10 +85,10 @@ inline int qstrcmp( const char *str1, const char *str2 )
qisempty(str1) ? -1 : 1; // one empty, other non-empty
}

inline int cstrncmp( const char *str1, const char *str2, uint len )
inline int cstrncmp( const char *str1, const char *str2, size_t len )
{ return strncmp(str1,str2,len); }

inline int qstrncmp( const char *str1, const char *str2, uint len )
inline int qstrncmp( const char *str1, const char *str2, size_t len )
{ return (str1 && str2) ? strncmp(str1,str2,len) : // both non-empty
(qisempty(str1) && qisempty(str2)) ? 0 : // both empty
qisempty(str1) ? -1 : 1; // one empty other non-empty
Expand All @@ -99,7 +99,7 @@ inline bool qisspace(char c)

int qstricmp( const char *str1, const char *str2 );

int qstrnicmp( const char *str1, const char *str2, uint len );
int qstrnicmp( const char *str1, const char *str2, size_t len );


/** This is an alternative implementation of QCString. It provides basically
Expand All @@ -122,15 +122,15 @@ class QCString
/** creates a string with room for size characters
* @param[in] size the number of character to allocate (also counting the 0-terminator!)
*/
explicit QCString( uint size ) { m_rep.resize(size>0 ? size-1 : 0); }
explicit QCString( size_t size ) { m_rep.resize(size>0 ? size-1 : 0); }

/** creates a string from a plain C string.
* @param[in] str A zero terminated C string. When 0 an empty string is created.
*/
QCString( const char *str ) : m_rep(str?str:"") {}

/** creates a string from \a str and copies over the first \a maxlen characters. */
QCString( const char *str, uint maxlen ) : m_rep(str?str:"") { m_rep.resize(maxlen); }
QCString( const char *str, size_t maxlen ) : m_rep(str?str:"") { m_rep.resize(maxlen); }

/** replaces the contents by that of C string \a str. */
QCString &operator=( const char *str) { m_rep = str?str:""; return *this; }
Expand Down Expand Up @@ -161,10 +161,10 @@ class QCString
* If the string is enlarged the contents will
* be left unmodified.
*/
bool resize( uint newlen ) { m_rep.resize( newlen>0 ? newlen-1 : 0 ); return TRUE; }
bool resize( size_t newlen ) { m_rep.resize( newlen>0 ? newlen-1 : 0 ); return TRUE; }

/** Truncates the string at position \a pos. */
bool truncate( uint pos ) { return resize( pos + 1 ); }
bool truncate( size_t pos ) { return resize( pos + 1 ); }

/** Fills a string with a predefined character
* @param[in] c the character used to fill the string with.
Expand Down Expand Up @@ -209,22 +209,22 @@ class QCString
return stripPrefix(QCString(prefix));
}

QCString left( uint len ) const
QCString left( size_t len ) const
{
return m_rep.empty() ? QCString() : QCString(m_rep.substr(0,len));
}

QCString right( uint len ) const
QCString right( size_t len ) const
{
return m_rep.empty() ? QCString() :
len<m_rep.size() ? QCString(m_rep.substr(m_rep.size()-len,len)) :
*this;
}

QCString mid( uint index, uint len=(uint)-1) const
QCString mid( size_t index, size_t len=static_cast<size_t>(-1)) const
{
uint slen = (uint)m_rep.size();
if (len==(uint)-1) len = slen-index;
size_t slen = m_rep.size();
if (len==static_cast<uint>(-1)) len = slen-index;
return m_rep.empty() || index>slen || len==0 ? QCString() :
QCString(m_rep.substr(index,len));
}
Expand All @@ -242,9 +242,9 @@ class QCString
/// returns a copy of this string with leading and trailing whitespace removed
QCString stripWhiteSpace() const
{
int sl = (uint)m_rep.size();
size_t sl = m_rep.size();
if (sl==0 || (!qisspace(m_rep[0]) && !qisspace(m_rep[sl-1]))) return *this;
int start=0,end=sl-1;
size_t start=0,end=sl-1;
while (start<sl && qisspace(m_rep[start])) start++;
if (start==sl) return QCString(); // only whitespace
while (end>start && qisspace(m_rep[end])) end--;
Expand All @@ -254,7 +254,7 @@ class QCString
/// returns a copy of this string with all whitespace removed
QCString removeWhiteSpace() const
{
size_t sl = (uint)m_rep.size();
size_t sl = m_rep.size();
if (sl==0) return *this;
std::string result = m_rep;
size_t src=0,dst=0;
Expand All @@ -271,11 +271,11 @@ class QCString
/// whitespace characters replaced by a single space
QCString simplifyWhiteSpace() const;

QCString &insert( uint index, const QCString &s )
QCString &insert( size_t index, const QCString &s )
{
if (s.length()>0)
{
uint ol = (uint)m_rep.size();
size_t ol = m_rep.size();
if (index>ol) // insert beyond end of string and fill gap with spaces
{
m_rep.resize(index+s.length());
Expand All @@ -289,12 +289,12 @@ class QCString
}
return *this;
}
QCString &insert( uint index, const char *s )
QCString &insert( size_t index, const char *s )
{
uint len = s ? qstrlen(s) : 0;
size_t len = s ? qstrlen(s) : 0;
if (len>0)
{
uint ol = (uint)m_rep.size();
size_t ol = m_rep.size();
if (index>ol) // insert beyond end of string and fill gap with spaces
{
m_rep.resize(index+len);
Expand All @@ -309,7 +309,7 @@ class QCString
return *this;
}

QCString &insert( uint index, char c)
QCString &insert( size_t index, char c)
{
char s[2] = { c, '\0' };
return insert(index,s);
Expand Down Expand Up @@ -351,14 +351,14 @@ class QCString
return insert(0,s.c_str());
}

QCString &remove( uint index, uint len )
QCString &remove( size_t index, size_t len )
{
uint ol = (uint)m_rep.size();
size_t ol = m_rep.size();
if (index<ol && len>0) m_rep.erase(index,index+len>=ol ? std::string::npos : len);
return *this;
}

QCString &replace( uint index, uint len, const char *s);
QCString &replace( size_t index, size_t len, const char *s);
//QCString &replace( const QRegExp &rx, const char *str );

short toShort( bool *ok=0, int base=10 ) const;
Expand Down Expand Up @@ -474,12 +474,12 @@ class QCString
#endif

/** Returns a reference to the character at index \a i. */
char &at( uint i)
char &at( size_t i)
{
return m_rep[i];
}

const char &at( uint i) const
const char &at( size_t i) const
{
return m_rep[i];
}
Expand Down Expand Up @@ -623,17 +623,17 @@ inline int qstricmp( const QCString &str1, const QCString &str2 )
return qstricmp(str1.data(),str2.data());
}

inline int qstrnicmp( const QCString &str1, const char *str2, uint len )
inline int qstrnicmp( const QCString &str1, const char *str2, size_t len )
{
return qstrnicmp(str1.data(),str2,len);
}

inline int qstrnicmp( const char *str1, const QCString &str2, uint len )
inline int qstrnicmp( const char *str1, const QCString &str2, size_t len )
{
return qstrnicmp(str1,str2.data(),len);
}

inline int qstrnicmp( const QCString &str1, const QCString &str2, uint len )
inline int qstrnicmp( const QCString &str1, const QCString &str2, size_t len )
{
return qstrnicmp(str1.data(),str2.data(),len);
}
Expand Down

0 comments on commit f0218cd

Please sign in to comment.