aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix building tests.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-07-06 14:26:42 +03:00
parent 490ccbe60a
commit 365f971d5f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/vdxf/libdxfrw/intern/drw_textcodec.cpp
View File

@ -81,7 +81,7 @@ std::string DRW_TextCodec::toUtf8(const std::string &s) {
return encodedString.toStdString(); return encodedString.toStdString();
} }
std::string DRW_TextCodec::fromUtf8(const std::__cxx11::string &s) { std::string DRW_TextCodec::fromUtf8(const std::string &s) {
if (conv == nullptr) if (conv == nullptr)
{ {
return s; return s;

4
src/libs/vdxf/libdxfrw/intern/dxfwriter.h
View File

@ -24,8 +24,8 @@ public:
virtual ~dxfWriter() = default; virtual ~dxfWriter() = default;
virtual bool writeString(int code, std::string text) = 0; virtual bool writeString(int code, std::string text) = 0;
bool writeUtf8String(int code, const std::__cxx11::string &text); bool writeUtf8String(int code, const std::string &text);
bool writeUtf8Caps(int code, const std::__cxx11::string &text); bool writeUtf8Caps(int code, const std::string &text);
std::string fromUtf8String(std::string t) {return encoder.fromUtf8(t);} std::string fromUtf8String(std::string t) {return encoder.fromUtf8(t);}
virtual bool writeInt16(int code, int data) = 0; virtual bool writeInt16(int code, int data) = 0;
virtual bool writeInt32(int code, int data) = 0; virtual bool writeInt32(int code, int data) = 0;

2
src/libs/vdxf/libdxfrw/libdxfrw.h
View File

@ -66,7 +66,7 @@ public:
bool writeText(DRW_Text *ent); bool writeText(DRW_Text *ent);
bool writeHatch(DRW_Hatch *ent); bool writeHatch(DRW_Hatch *ent);
bool writeViewport(DRW_Viewport *ent); bool writeViewport(DRW_Viewport *ent);
DRW_ImageDef *writeImage(DRW_Image *ent, const std::__cxx11::string &name); DRW_ImageDef *writeImage(DRW_Image *ent, const std::string &name);
bool writeLeader(DRW_Leader *ent); bool writeLeader(DRW_Leader *ent);
bool writeDimension(DRW_Dimension *ent); bool writeDimension(DRW_Dimension *ent);
void setEllipseParts(int parts){elParts = parts;} /*!< set parts munber when convert ellipse to polyline */ void setEllipseParts(int parts){elParts = parts;} /*!< set parts munber when convert ellipse to polyline */