Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1889 for code


Ignore:
Timestamp:
Oct 6, 2008, 1:05:07 AM (16 years ago)
Author:
landauf
Message:

unsigned int → size_t for std::string related functions
I hope this fixes some problems on 64bit systems

Location:
code/trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • code/trunk/CMakeLists.txt

    r1874 r1889  
    5050SET(CMAKE_C_FLAGS "$ENV{CFLAGS} -O0 -Wall -g -ggdb")
    5151SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O0 -Wall -g -ggdb")
    52 #SET(CMAKE_C_FLAGS "$ENV{CFLAGS} -O3")
    53 #SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O3")
     52#SET(CMAKE_C_FLAGS "$ENV{CFLAGS} -O3 -s")
     53#SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O3 -s")
    5454
    5555SET(CMAKE_LD_FLAGS "$ENV{LDFLAGS}")

  • code/trunk/cmake/FindDirectX.cmake

    r1872 r1889  
    1616
    1717  FIND_PATH(DirectX_INCLUDE_DIR "dinput.h"
    18     C:/DXSDK/Include
     18    ../libs/DXSDK/Include
    1919    $ENV{DXSDK_DIR}/Include
    2020  )
    2121
    2222  FIND_PATH(DirectX_LIB_DIR "dinput8.lib"
    23     C:/DXSDK/Lib
    24     C:/DXSDK/Lib/x86
     23    ../libs/DXSDK/Lib
     24    ../libs/DXSDK/Lib/x86
    2525    $ENV{DXSDK_DIR}/lib/x86
    2626  )

  • code/trunk/src/core/ConfigFileManager.cc

    r1795 r1889  
    255255            if (!isEmpty(temp) && !isComment(temp))
    256256            {
    257                 unsigned int   pos1 = temp.find('[');
     257                size_t   pos1 = temp.find('[');
    258258                if (pos1 == 0) pos1 = line.find('['); else pos1 = std::string::npos;
    259                 unsigned int   pos2 = line.find(']');
     259                size_t   pos2 = line.find(']');
    260260
    261261                if (pos1 != std::string::npos && pos2 != std::string::npos && pos2 > pos1 + 1)
    … …  
    282282                else
    283283                {
    284                     unsigned int pos1 = line.find('=');
     284                    size_t pos1 = line.find('=');
    285285
    286286                    if (pos1 != std::string::npos && pos1 > 0)
    287287                    {
    288288                        // New entry
    289                         unsigned int pos2 = line.find('[');
    290                         unsigned int pos3 = line.find(']');
    291                         unsigned int commentposition = getNextCommentPosition(line, pos1 + 1);
     289                        size_t pos2 = line.find('[');
     290                        size_t pos3 = line.find(']');
     291                        size_t commentposition = getNextCommentPosition(line, pos1 + 1);
    292292                        while (isBetweenQuotes(line, commentposition))
    293293                        {

  • code/trunk/src/core/Executor.h

    r1879 r1889  
    177177            inline FunctionType getType() const
    178178                { return this->functor_->getType(); }
    179             inline MultiType getReturnvalue() const
     179            inline const MultiType& getReturnvalue() const
    180180                { return this->functor_->getReturnvalue(); }
    181             inline std::string getTypenameParam(unsigned int param) const
     181            inline const std::string& getTypenameParam(unsigned int param) const
    182182                { return this->functor_->getTypenameParam(param); }
    183             inline std::string getTypenameReturnvalue() const
     183            inline const std::string& getTypenameReturnvalue() const
    184184                { return this->functor_->getTypenameReturnvalue(); }
    185185

  • code/trunk/src/core/Functor.h

    r1879 r1889  
    3434
    3535#include "util/MultiType.h"
     36#include "util/String.h"
    3637#include "util/Debug.h"
    3738
    … …  
    103104            inline bool hasReturnvalue() const { return this->hasReturnValue_; }
    104105            inline FunctionType getType() const { return this->type_; }
    105             inline MultiType getReturnvalue() const { return this->returnedValue_; }
    106 
    107             std::string getTypenameParam(unsigned int param) const { return (param < 5) ? this->typeParam_[param] : ""; }
    108             std::string getTypenameReturnvalue() const { return this->typeReturnvalue_; }
     106            inline const MultiType& getReturnvalue() const { return this->returnedValue_; }
     107
     108            const std::string& getTypenameParam(unsigned int param) const { return (param < 5) ? this->typeParam_[param] : blankString; }
     109            const std::string& getTypenameReturnvalue() const { return this->typeReturnvalue_; }
    109110
    110111            virtual void evaluateParam(unsigned int index, MultiType& param) const = 0;

  • code/trunk/src/core/Namespace.cc

    r1854 r1889  
    6363
    6464        std::string name = this->getName();
    65         unsigned int pos = 0;
     65        size_t pos = 0;
    6666        while ((pos = name.find(',')) != std::string::npos)
    6767            name.replace(pos, 1, " ");

  • code/trunk/src/core/NamespaceNode.cc

    r1747 r1889  
    5656        else
    5757        {
    58             unsigned int pos = name.find("::");
     58            size_t pos = name.find("::");
    5959            std::string firstPart = name;
    6060            std::string secondPart;

  • code/trunk/src/core/Script.cc

    r1810 r1889  
    3333
    3434#include "CoreIncludes.h"
     35
     36#include "util/String.h"
    3537
    3638#include "lua/lua.hpp"
    … …  
    131133  }
    132134
    133   unsigned int Script::getNextQuote(const std::string& text, unsigned int start)
    134   {
    135     unsigned int quote = start - 1;
    136 
    137     while ((quote = text.find('\"', quote + 1)) != std::string::npos)
    138     {
    139       unsigned int backslash = quote;
    140       unsigned int numbackslashes = 0;
    141       for (; backslash > 0; backslash--, numbackslashes++)
    142         if (text[backslash - 1] != '\\')
    143           break;
    144 
    145       if (numbackslashes % 2 == 0)
    146         break;
    147     }
    148 
    149     return quote;
    150   }
    151 
    152135  std::string Script::replaceLuaTags(const std::string& text)
    153136  {
    154137    // chreate map with all Lua tags
    155     std::map<unsigned int, bool> luaTags;
    156     {
    157       unsigned int pos = 0;
     138    std::map<size_t, bool> luaTags;
     139    {
     140      size_t pos = 0;
    158141      while ((pos = text.find("<?lua", pos)) != std::string::npos)
    159142        luaTags[pos++] = true;
    160143    }
    161144    {
    162       unsigned int pos = 0;
     145      size_t pos = 0;
    163146      while ((pos = text.find("?>", pos)) != std::string::npos)
    164147        luaTags[pos++] = false;
    … …  
    167150    // erase all tags from the map that are between two quotes
    168151    {
    169       std::map<unsigned int, bool>::iterator it = luaTags.begin();
    170       std::map<unsigned int, bool>::iterator it2 = it;
     152      std::map<size_t, bool>::iterator it = luaTags.begin();
     153      std::map<size_t, bool>::iterator it2 = it;
    171154      bool bBetweenQuotes = false;
    172       unsigned int pos = 0;
     155      size_t pos = 0;
    173156      while ((pos = getNextQuote(text, pos)) != std::string::npos)
    174157      {
    … …  
    193176    {
    194177      bool expectedValue = true;
    195       for (std::map<unsigned int, bool>::iterator it = luaTags.begin(); it != luaTags.end(); ++it)
     178      for (std::map<size_t, bool>::iterator it = luaTags.begin(); it != luaTags.end(); ++it)
    196179      {
    197180        if (it->second == expectedValue)
    … …  
    212195    std::string output;
    213196    {
    214       std::map<unsigned int, bool>::iterator it = luaTags.begin();
     197      std::map<size_t, bool>::iterator it = luaTags.begin();
    215198      bool bInPrintFunction = true;
    216       unsigned int start = 0;
    217       unsigned int end = 0;
     199      size_t start = 0;
     200      size_t end = 0;
    218201
    219202      do
    … …  
    231214          std::string temp = text.substr(start, end - start);
    232215          {
    233             unsigned int pos = 0;
     216            size_t pos = 0;
    234217            while ((pos = temp.find('[', pos)) != std::string::npos)
    235218            {
    236219              unsigned int tempCounter = 1;
    237               unsigned int tempPos = pos++;
     220              size_t tempPos = pos++;
    238221              while(temp[++tempPos] == '=') {
    239222                tempCounter++;
    … …  
    250233          }
    251234          {
    252             unsigned int pos = 0;
     235            size_t pos = 0;
    253236            while ((pos = temp.find(']', pos)) != std::string::npos)
    254237            {
    255238              unsigned int tempCounter = 1;
    256               unsigned int tempPos = pos++;
     239              size_t tempPos = pos++;
    257240              while(temp[++tempPos] == '=') {
    258241                tempCounter++;

  • code/trunk/src/core/Script.h

    r1810 r1889  
    7676    inline void clearLuaOutput() { output_ = ""; }
    7777
    78     unsigned int getNextQuote(const std::string& text, unsigned int start);
    7978    std::string replaceLuaTags(const std::string& text);
    8079

  • code/trunk/src/core/XMLPort.h

    r1856 r1889  
    8383*/
    8484#define XMLPortParamTemplate(classname, paramname, loadfunction, savefunction, xmlelement, mode, ...) \
    85     XMLPortParamGeneric(xmlcontainer##loadfunction##savefunction, classname, classname, this, paramname, orxonox::createExecutor(orxonox::createFunctor< __VA_ARGS__ >(&classname::loadfunction), std::string( #classname ) + "::" + #loadfunction), orxonox::createExecutor(orxonox::createFunctor(&classname::savefunction), std::string( #classname ) + "::" + #savefunction), xmlelement, mode)
     85    XMLPortParamGeneric(xmlcontainer##loadfunction##savefunction, classname, classname, this, paramname, orxonox::createExecutor(orxonox::createFunctor<classname, __VA_ARGS__ >(&classname::loadfunction), std::string( #classname ) + "::" + #loadfunction), orxonox::createExecutor(orxonox::createFunctor(&classname::savefunction), std::string( #classname ) + "::" + #savefunction), xmlelement, mode)
    8686
    8787// --------------------
    … …  
    105105*/
    106106#define XMLPortParamLoadOnlyTemplate(classname, paramname, loadfunction, xmlelement, mode, ...) \
    107     XMLPortParamGeneric(xmlcontainer##loadfunction##0, classname, classname, this, paramname, orxonox::createExecutor(orxonox::createFunctor< __VA_ARGS__ >(&classname::loadfunction), std::string( #classname ) + "::" + #loadfunction), 0, xmlelement, mode)
     107    XMLPortParamGeneric(xmlcontainer##loadfunction##0, classname, classname, this, paramname, orxonox::createExecutor(orxonox::createFunctor<classname, __VA_ARGS__ >(&classname::loadfunction), std::string( #classname ) + "::" + #loadfunction), 0, xmlelement, mode)
    108108
    109109// ------------------
    … …  
    135135*/
    136136#define XMLPortParamExternTemplate(classname, externclass, object, paramname, loadfunction, savefunction, xmlelement, mode, ...) \
    137     XMLPortParamGeneric(xmlcontainer##loadfunction##savefunction, classname, externclass, object, paramname, orxonox::createExecutor(orxonox::createFunctor< __VA_ARGS__ >(&externclass::loadfunction), std::string( #externclass ) + "::" + #loadfunction), orxonox::createExecutor(orxonox::createFunctor(&externclass::savefunction), std::string( #externclass ) + "::" + #savefunction), xmlelement, mode);
     137    XMLPortParamGeneric(xmlcontainer##loadfunction##savefunction, classname, externclass, object, paramname, orxonox::createExecutor(orxonox::createFunctor<externclass, __VA_ARGS__ >(&externclass::loadfunction), std::string( #externclass ) + "::" + #loadfunction), orxonox::createExecutor(orxonox::createFunctor(&externclass::savefunction), std::string( #externclass ) + "::" + #savefunction), xmlelement, mode);
    138138
    139139// -------------------

  • code/trunk/src/orxonox/objects/WorldEntity.cc

    r1854 r1889  
    113113        SUPER(WorldEntity, XMLPort, xmlelement, mode);
    114114
    115         XMLPortParamExternTemplate(WorldEntity, Ogre::Node, this->node_, "position", setPosition, getPosition, xmlelement, mode, Ogre::Node, const Vector3&);
     115        XMLPortParamExternTemplate(WorldEntity, Ogre::Node, this->node_, "position", setPosition, getPosition, xmlelement, mode, const Vector3&);
    116116        XMLPortParamLoadOnly(WorldEntity, "direction", setDirectionSimple, xmlelement, mode);
    117117        XMLPortParamLoadOnly(WorldEntity, "yawpitchroll", setYawPitchRoll, xmlelement, mode);
    118118        XMLPortParam(WorldEntity, "scale", setScale, getScale, xmlelement, mode);
    119         XMLPortParamTemplate(WorldEntity, "rotationAxis", setRotationAxis, getRotationAxis, xmlelement, mode, WorldEntity, const Vector3&);
     119        XMLPortParamTemplate(WorldEntity, "rotationAxis", setRotationAxis, getRotationAxis, xmlelement, mode, const Vector3&);
    120120        XMLPortParam(WorldEntity, "rotationRate", setRotationRate, getRotationRate, xmlelement, mode);
    121121

  • code/trunk/src/util/Convert.h

    r1837 r1889  
    512512    static bool convert(orxonox::Vector2* output, const std::string& input)
    513513    {
    514         unsigned int opening_parenthesis, closing_parenthesis = input.find(')');
     514        size_t opening_parenthesis, closing_parenthesis = input.find(')');
    515515        if ((opening_parenthesis = input.find('(')) == std::string::npos) { opening_parenthesis = 0; } else { opening_parenthesis++; }
    516516
    … …  
    536536    static bool convert(orxonox::Vector3* output, const std::string& input)
    537537    {
    538         unsigned int opening_parenthesis, closing_parenthesis = input.find(')');
     538        size_t opening_parenthesis, closing_parenthesis = input.find(')');
    539539        if ((opening_parenthesis = input.find('(')) == std::string::npos) { opening_parenthesis = 0; } else { opening_parenthesis++; }
    540540
    … …  
    562562    static bool convert(orxonox::Vector4* output, const std::string& input)
    563563    {
    564         unsigned int opening_parenthesis, closing_parenthesis = input.find(')');
     564        size_t opening_parenthesis, closing_parenthesis = input.find(')');
    565565        if ((opening_parenthesis = input.find('(')) == std::string::npos) { opening_parenthesis = 0; } else { opening_parenthesis++; }
    566566
    … …  
    590590    static bool convert(orxonox::Quaternion* output, const std::string& input)
    591591    {
    592         unsigned int opening_parenthesis, closing_parenthesis = input.find(')');
     592        size_t opening_parenthesis, closing_parenthesis = input.find(')');
    593593        if ((opening_parenthesis = input.find('(')) == std::string::npos) { opening_parenthesis = 0; } else { opening_parenthesis++; }
    594594
    … …  
    618618    static bool convert(orxonox::ColourValue* output, const std::string& input)
    619619    {
    620         unsigned int opening_parenthesis, closing_parenthesis = input.find(')');
     620        size_t opening_parenthesis, closing_parenthesis = input.find(')');
    621621        if ((opening_parenthesis = input.find('(')) == std::string::npos) { opening_parenthesis = 0; } else { opening_parenthesis++; }
    622622

  • code/trunk/src/util/String.cc

    r1830 r1889  
    4848void strip(std::string* str)
    4949{
    50     unsigned int pos;
     50    size_t pos;
    5151    while ((pos = (*str).find(" ")) < (*str).length())
    5252        (*str).erase(pos, 1);
    … …  
    7676std::string removeTrailingWhitespaces(const std::string& str)
    7777{
    78     unsigned int pos1 = 0;
     78    size_t pos1 = 0;
    7979    int pos2 = str.size() - 1;
    8080    for (; pos1 < str.size() && (str[pos1] == ' ' || str[pos1] == '\t' || str[pos1] == '\n'); pos1++);
    81     for (; pos2 > 0          && (str[pos2] == ' ' || str[pos2] == '\t' || str[pos2] == '\n'); pos2--);
     81    for (; pos2 != 0         && (str[pos2] == ' ' || str[pos2] == '\t' || str[pos2] == '\n'); pos2--);
    8282    return str.substr(pos1, pos2 - pos1 + 1);
    8383}
    … …  
    8989    @return The position of the next quote (std::string::npos if there is no next quote)
    9090*/
    91 unsigned int getNextQuote(const std::string& str, unsigned int start)
    92 {
    93     unsigned int quote = start - 1;
     91size_t getNextQuote(const std::string& str, size_t start)
     92{
     93    size_t quote = start - 1;
    9494
    9595    while ((quote = str.find('\"', quote + 1)) != std::string::npos)
    9696    {
    97         unsigned int backslash = quote;
    98         unsigned int numbackslashes = 0;
     97        size_t backslash = quote;
     98        size_t numbackslashes = 0;
    9999        for (; backslash > 0; backslash--, numbackslashes++)
    100100            if (str[backslash - 1] != '\\')
    … …  
    114114    @return True if pos is between two quotes
    115115*/
    116 bool isBetweenQuotes(const std::string& str, unsigned int pos)
     116bool isBetweenQuotes(const std::string& str, size_t pos)
    117117{
    118118    if (pos == std::string::npos)
    119119        return false;
    120120
    121     unsigned int quotecount = 0;
    122     unsigned int quote = (unsigned int)-1;
     121    size_t quotecount = 0;
     122    size_t quote = (size_t)-1;
    123123    while ((quote = getNextQuote(str, quote + 1)) < pos)
    124124    {
    … …  
    141141bool hasStringBetweenQuotes(const std::string& str)
    142142{
    143     unsigned int pos1 = getNextQuote(str, 0);
    144     unsigned int pos2 = getNextQuote(str, pos1 + 1);
     143    size_t pos1 = getNextQuote(str, 0);
     144    size_t pos2 = getNextQuote(str, pos1 + 1);
    145145    return (pos1 != std::string::npos && pos2 != std::string::npos && pos2 > pos1 + 1);
    146146}
    … …  
    153153std::string getStringBetweenQuotes(const std::string& str)
    154154{
    155     unsigned int pos1 = getNextQuote(str, 0);
    156     unsigned int pos2 = getNextQuote(str, pos1 + 1);
     155    size_t pos1 = getNextQuote(str, 0);
     156    size_t pos2 = getNextQuote(str, pos1 + 1);
    157157    if (pos1 != std::string::npos && pos2 != std::string::npos)
    158158        return str.substr(pos1, pos2 - pos1 + 1);
    … …  
    168168std::string stripEnclosingQuotes(const std::string& str)
    169169{
    170     unsigned int start = std::string::npos;
    171     unsigned int end = 0;
    172 
    173     for (unsigned int pos = 0; (pos < str.size()) && (pos < std::string::npos); pos++)
     170    size_t start = std::string::npos;
     171    size_t end = 0;
     172
     173    for (size_t pos = 0; (pos < str.size()) && (pos < std::string::npos); pos++)
    174174    {
    175175        if (str[pos] == '"')
    … …  
    183183    }
    184184
    185     for (unsigned int pos = str.size() - 1; pos < std::string::npos; pos--)
     185    for (size_t pos = str.size() - 1; pos < std::string::npos; pos--)
    186186    {
    187187        if (str[pos] == '"')
    … …  
    290290    std::string output = str;
    291291
    292     for (unsigned int pos = 0; (pos = output.find('\\', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\\\"); }
    293     for (unsigned int pos = 0; (pos = output.find('\n', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\n"); }
    294     for (unsigned int pos = 0; (pos = output.find('\t', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\t"); }
    295     for (unsigned int pos = 0; (pos = output.find('\v', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\v"); }
    296     for (unsigned int pos = 0; (pos = output.find('\b', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\b"); }
    297     for (unsigned int pos = 0; (pos = output.find('\r', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\r"); }
    298     for (unsigned int pos = 0; (pos = output.find('\f', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\f"); }
    299     for (unsigned int pos = 0; (pos = output.find('\a', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\a"); }
    300     for (unsigned int pos = 0; (pos = output.find('"', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\\""); }
    301     for (unsigned int pos = 0; (pos = output.find('\0', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\0"); }
     292    for (size_t pos = 0; (pos = output.find('\\', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\\\"); }
     293    for (size_t pos = 0; (pos = output.find('\n', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\n"); }
     294    for (size_t pos = 0; (pos = output.find('\t', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\t"); }
     295    for (size_t pos = 0; (pos = output.find('\v', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\v"); }
     296    for (size_t pos = 0; (pos = output.find('\b', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\b"); }
     297    for (size_t pos = 0; (pos = output.find('\r', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\r"); }
     298    for (size_t pos = 0; (pos = output.find('\f', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\f"); }
     299    for (size_t pos = 0; (pos = output.find('\a', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\a"); }
     300    for (size_t pos = 0; (pos = output.find('"', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\\""); }
     301    for (size_t pos = 0; (pos = output.find('\0', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\0"); }
    302302
    303303    return output;
    … …  
    315315
    316316    std::string output = "";
    317     for (unsigned int pos = 0; pos < str.size() - 1; )
     317    for (size_t pos = 0; pos < str.size() - 1; )
    318318    {
    319319        if (str[pos] == '\\')
    … …  
    345345void lowercase(std::string* str)
    346346{
    347     for (unsigned int i = 0; i < str->size(); ++i)
     347    for (size_t i = 0; i < str->size(); ++i)
    348348    {
    349349        (*str)[i] = (char)tolower((*str)[i]);
    … …  
    369369void uppercase(std::string* str)
    370370{
    371     for (unsigned int i = 0; i < str->size(); ++i)
     371    for (size_t i = 0; i < str->size(); ++i)
    372372    {
    373373        (*str)[i] = (char)toupper((*str)[i]);
    … …  
    421421    @param len Maximal number of chars to compare
    422422*/
    423 int nocaseCmp(const std::string& s1, const std::string& s2, unsigned int len)
     423int nocaseCmp(const std::string& s1, const std::string& s2, size_t len)
    424424{
    425425    if (len == 0)
    … …  
    466466    @return The position
    467467*/
    468 unsigned int getCommentPosition(const std::string& str)
     468size_t getCommentPosition(const std::string& str)
    469469{
    470470    return getNextCommentPosition(str, 0);
    … …  
    477477    @return The position
    478478*/
    479 unsigned int getNextCommentPosition(const std::string& str, unsigned int start)
    480 {
    481     for (unsigned int i = start; i < str.size(); i++)
     479size_t getNextCommentPosition(const std::string& str, size_t start)
     480{
     481    for (size_t i = start; i < str.size(); i++)
    482482        if (isComment(str.substr(i)))
    483483            return i;

  • code/trunk/src/util/String.h

    r1791 r1889  
    4242extern _UtilExport std::string blankString;
    4343
    44 _UtilExport void         strip(std::string* str);
    45 _UtilExport std::string  getStripped(const std::string& str);
     44_UtilExport void        strip(std::string* str);
     45_UtilExport std::string getStripped(const std::string& str);
    4646
    47 _UtilExport std::string  removeTrailingWhitespaces(const std::string& str);
     47_UtilExport std::string removeTrailingWhitespaces(const std::string& str);
    4848
    49 _UtilExport unsigned int getNextQuote(const std::string& str, unsigned int start);
    50 _UtilExport bool         isBetweenQuotes(const std::string& str, unsigned int pos);
     49_UtilExport size_t      getNextQuote(const std::string& str, size_t start);
     50_UtilExport bool        isBetweenQuotes(const std::string& str, size_t pos);
    5151
    52 _UtilExport bool         hasStringBetweenQuotes(const std::string& str);
    53 _UtilExport std::string  getStringBetweenQuotes(const std::string& str);
     52_UtilExport bool        hasStringBetweenQuotes(const std::string& str);
     53_UtilExport std::string getStringBetweenQuotes(const std::string& str);
    5454
    55 _UtilExport std::string  stripEnclosingQuotes(const std::string& str);
    56 _UtilExport std::string  stripEnclosingBraces(const std::string& str);
     55_UtilExport std::string stripEnclosingQuotes(const std::string& str);
     56_UtilExport std::string stripEnclosingBraces(const std::string& str);
    5757
    58 _UtilExport bool         isEmpty(const std::string& str);
    59 _UtilExport bool         isComment(const std::string& str);
    60 _UtilExport bool         isNumeric(const std::string& str);
     58_UtilExport bool        isEmpty(const std::string& str);
     59_UtilExport bool        isComment(const std::string& str);
     60_UtilExport bool        isNumeric(const std::string& str);
    6161
    62 _UtilExport std::string  addSlashes(const std::string& str);
    63 _UtilExport std::string  removeSlashes(const std::string& str);
     62_UtilExport std::string addSlashes(const std::string& str);
     63_UtilExport std::string removeSlashes(const std::string& str);
    6464
    65 _UtilExport void         lowercase(std::string* str);
    66 _UtilExport std::string  getLowercase(const std::string& str);
     65_UtilExport void        lowercase(std::string* str);
     66_UtilExport std::string getLowercase(const std::string& str);
    6767
    68 _UtilExport void         uppercase(std::string* str);
    69 _UtilExport std::string  getUppercase(const std::string& str);
     68_UtilExport void        uppercase(std::string* str);
     69_UtilExport std::string getUppercase(const std::string& str);
    7070
    71 _UtilExport int          nocaseCmp(const std::string& s1, const std::string& s2);
    72 _UtilExport int          nocaseCmp(const std::string& s1, const std::string& s2, unsigned int len);
     71_UtilExport int         nocaseCmp(const std::string& s1, const std::string& s2);
     72_UtilExport int         nocaseCmp(const std::string& s1, const std::string& s2, size_t len);
    7373
    74 _UtilExport bool         hasComment(const std::string& str);
    75 _UtilExport std::string  getComment(const std::string& str);
    76 _UtilExport unsigned int getCommentPosition(const std::string& str);
    77 _UtilExport unsigned int getNextCommentPosition(const std::string& str, unsigned int start = 0);
     74_UtilExport bool        hasComment(const std::string& str);
     75_UtilExport std::string getComment(const std::string& str);
     76_UtilExport size_t      getCommentPosition(const std::string& str);
     77_UtilExport size_t      getNextCommentPosition(const std::string& str, size_t start = 0);
    7878
    7979#endif /* _Util_String_H__ */
Note: See TracChangeset for help on using the changeset viewer.