X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcore%2Futil%2FString.hpp;h=c5412f809f23f81bc129075ba990475dc6436991;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=db6a23c0fc2036d9e969703281f9554ec005bc22;hpb=884501d2411bc4fdfafae65948262c959e068d7d;p=anna.git diff --git a/include/anna/core/util/String.hpp b/include/anna/core/util/String.hpp index db6a23c..c5412f8 100644 --- a/include/anna/core/util/String.hpp +++ b/include/anna/core/util/String.hpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not 'N' Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// https://bitbucket.org/testillano/anna -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: eduardo.ramos.testillano@gmail.com -// cisco.tierra@gmail.com +// ANNA - Anna is Not Nothingness Anymore // +// // +// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo // +// // +// See project site at http://redmine.teslayout.com/projects/anna-suite // +// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE // #ifndef anna_core_util_String_hpp @@ -92,45 +64,45 @@ public: /** * Convierte a may�sculas el contenido de esta instancia. */ - void toUpper() throw(); + void toUpper() ; /** * Convierte a min�sculas el contenido de esta instancia. */ - void toLower() throw(); - - String& operator = (const char* vv) throw() { std::string::clear(); return operator<< (vv); } - String& operator = (const int vv) throw() { std::string::clear(); return operator<< (vv); } - String& operator = (const unsigned int vv) throw() { std::string::clear(); return operator<< (vv); } - String& operator = (const bool vv) throw() { std::string::clear(); return operator<< (vv); } - String& operator = (const S64 vv) throw() { std::string::clear(); return operator<< (vv); } - String& operator = (const U64 vv) throw() { std::string::clear(); return operator<< (vv); } - String& operator = (const float vv) throw() { std::string::clear(); return operator<< (vv); } - String& operator = (const double vv) throw() { std::string::clear(); return operator<< (vv); } - String& operator = (const std::string& vv) throw() { std::string::operator= (vv); return *this; } - String& operator = (const DataBlock& vv) throw() { std::string::clear(); return operator<< (vv); } - - String& operator += (const char* vv) throw() { return operator<< (vv); } - String& operator += (const int vv) throw() { return operator<< (vv); } - String& operator += (const unsigned int vv) throw() { return operator<< (vv); } - String& operator += (const bool vv) throw() { return operator<< (vv); } - String& operator += (const S64 vv) throw() { return operator<< (vv); } - String& operator += (const U64 vv) throw() { return operator<< (vv); } - String& operator += (const float vv) throw() { return operator<< (vv); } - String& operator += (const double vv) throw() { return operator<< (vv); } - String& operator += (const std::string& vv) throw() { return *this << vv; } - String& operator += (const DataBlock& vv) throw() { return *this << vv; } - - String& operator << (const char* vv) throw(); - String& operator << (const int vv) throw(); - String& operator << (const unsigned int vv) throw(); - String& operator << (const bool vv) throw() { std::string::operator+= ((vv == true) ? "true" : "false"); return *this; } - String& operator << (const S64 vv) throw(); - String& operator << (const U64 vv) throw(); - String& operator << (const float vv) throw(); - String& operator << (const double vv) throw(); - String& operator << (const std::string& vv) throw() { std::string::operator+= (vv); return *this; } - String& operator << (const DataBlock& vv) throw(); + void toLower() ; + + String& operator = (const char* vv) { std::string::clear(); return operator<< (vv); } + String& operator = (const int vv) { std::string::clear(); return operator<< (vv); } + String& operator = (const unsigned int vv) { std::string::clear(); return operator<< (vv); } + String& operator = (const bool vv) { std::string::clear(); return operator<< (vv); } + String& operator = (const S64 vv) { std::string::clear(); return operator<< (vv); } + String& operator = (const U64 vv) { std::string::clear(); return operator<< (vv); } + String& operator = (const float vv) { std::string::clear(); return operator<< (vv); } + String& operator = (const double vv) { std::string::clear(); return operator<< (vv); } + String& operator = (const std::string& vv) { std::string::operator= (vv); return *this; } + String& operator = (const DataBlock& vv) { std::string::clear(); return operator<< (vv); } + + String& operator += (const char* vv) { return operator<< (vv); } + String& operator += (const int vv) { return operator<< (vv); } + String& operator += (const unsigned int vv) { return operator<< (vv); } + String& operator += (const bool vv) { return operator<< (vv); } + String& operator += (const S64 vv) { return operator<< (vv); } + String& operator += (const U64 vv) { return operator<< (vv); } + String& operator += (const float vv) { return operator<< (vv); } + String& operator += (const double vv) { return operator<< (vv); } + String& operator += (const std::string& vv) { return *this << vv; } + String& operator += (const DataBlock& vv) { return *this << vv; } + + String& operator << (const char* vv) ; + String& operator << (const int vv) ; + String& operator << (const unsigned int vv) ; + String& operator << (const bool vv) { std::string::operator+= ((vv == true) ? "true" : "false"); return *this; } + String& operator << (const S64 vv) ; + String& operator << (const U64 vv) ; + String& operator << (const float vv) ; + String& operator << (const double vv) ; + String& operator << (const std::string& vv) { std::string::operator+= (vv); return *this; } + String& operator << (const DataBlock& vv) ; /** * Formatea el contenido del \em float con la cadena recibida como par�metro. @@ -139,7 +111,7 @@ public: * \param format Cadena usada para interpretar el valor (ver sprintf). * \return La cadena con el contenido interpretado. */ - static String format(const float vv, const char* format) throw() { return __format(vv, format); } + static String format(const float vv, const char* format) { return __format(vv, format); } /** * Formatea el contenido del \em double con la cadena recibida como par�metro. @@ -148,7 +120,7 @@ public: * \param format Cadena usada para interpretar el valor (ver sprintf). * \return La cadena con el contenido interpretado. */ - static String format(const double vv, const char* format) throw() { return __format(vv, format); } + static String format(const double vv, const char* format) { return __format(vv, format); } /** * Formatea el contenido del DataBlock con el n�mero de caracteres por l�nea recibida como par�metro. @@ -156,7 +128,7 @@ public: * \param characterByLine N�mero de caracters por l�nea. * \return La cadena con el contenido interpretado. */ - static String format(const DataBlock& vv, const int characterByLine) throw(); + static String format(const DataBlock& vv, const int characterByLine) ; /** * Formatea el valor del par�metro como un n�mero en hexadecimal.