X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Futil%2FTextManager.cpp;h=982ba7872088b687aa92119549d06231ef14d417;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=761827e8d9526dcf099d2706ef5f594b6fe58e83;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git diff --git a/source/core/util/TextManager.cpp b/source/core/util/TextManager.cpp index 761827e..982ba78 100644 --- a/source/core/util/TextManager.cpp +++ b/source/core/util/TextManager.cpp @@ -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 // #include @@ -50,7 +22,7 @@ TextManager::TextManager(const char* name) : } void TextManager::clear() -throw() { +{ Guard guard(*this, "TextManager::clear"); for(TextComposerVector::iterator ii = a_composers.begin(), maxii = a_composers.end(); ii != maxii; ii ++) @@ -60,7 +32,7 @@ throw() { } void TextManager::create(const int composer, const char* expression) -throw(RuntimeException) { +noexcept(false) { TextComposer* result = NULL; Guard guard(*this, "TextManager::create"); @@ -93,7 +65,7 @@ throw(RuntimeException) { } TextComposer& TextManager::find(const int composer) -throw(RuntimeException) { +noexcept(false) { TextComposer* result; Guard guard(*this, "TextManager::find"); @@ -108,20 +80,18 @@ throw(RuntimeException) { } const TextComposer& TextManager::find(const int composer) const -throw(RuntimeException) { +noexcept(false) { const TextComposer& result = const_cast (this)->find(composer); return result; } TextComposer* TextManager::createTextComposer(const int composer, const char* expression) -throw() { +{ return new TextComposer(composer, expression); } TextComposer* TextManager::xfind(const int composer) -throw() { - TextComposer* result = NULL; - +{ for(TextComposerVector::iterator ii = a_composers.begin(), maxii = a_composers.end(); ii != maxii; ii ++) if((*ii)->getId() == composer) { return (*ii);