diff --git a/src/domain/domain.pri b/src/domain/domain.pri index a7dbb78d..bb3751e4 100644 --- a/src/domain/domain.pri +++ b/src/domain/domain.pri @@ -45,8 +45,8 @@ SOURCES += src/domain/UBGraphicsScene.cpp \ src/domain/UBGraphicsStroke.cpp \ src/domain/UBGraphicsMediaItem.cpp \ src/domain/UBAbstractUndoCommand.cpp \ - src/domain/ubgraphicsgroupcontaineritem.cpp \ - src/domain/ubgraphicsgroupcontaineritemdelegate.cpp \ + src/domain/UBGraphicsGroupContainerItem.cpp \ + src/domain/UBGraphicsGroupContainerItemDelegate.cpp \ src/domain/UBGraphicsStrokesGroup.cpp \ src/domain/UBGraphicsItemGroupUndoCommand.cpp \ src/domain/UBGraphicsItemDelegate.cpp \ diff --git a/src/pdf-merger/Utils.cpp b/src/pdf-merger/Utils.cpp index 44b3ec91..f1fe14c2 100644 --- a/src/pdf-merger/Utils.cpp +++ b/src/pdf-merger/Utils.cpp @@ -14,6 +14,7 @@ */ #include +#include #include "Config.h" #include "Utils.h" #include "Exception.h" @@ -65,18 +66,12 @@ double Utils::stringToDouble(const std::string & s ) std::string Utils::uIntToStr(unsigned int integer) { - char str[10]; - snprintf(str, sizeof(str), "%u", integer); - return std::string(str); - + return std::string(QString::number(integer).toAscii()); } std::string Utils::doubleToStr(double doubleValue) { - char str[16]; - snprintf(str, sizeof(str), "%f", doubleValue); - return std::string(str); - + return std::string(QString::number(doubleValue).toAscii()); } int Utils::_stringToInt(const std::string & str) //throw ConvertException