mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-12-25 01:51:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed compile errors (using QString instead of std::string, where appropriate)

Browse Source
This commit is contained in:
jkriege2 2023-12-19 10:38:58 +01:00
parent f2004a6f66
commit f4ac9374d4
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/jkqtplotter/jkqtptools.cpp
View File

@ -188,19 +188,19 @@ QString JKQTPKeyPosition2String(JKQTPKeyPosition pos) {
}
QString res;
if (pos.testFlag(JKQTPKeyInside)) res+=std::string(res.size()>0?"|":"")+"inside";
else if (pos.testFlag(JKQTPKeyOutsideTop)) res+=std::string(res.size()>0?"|":"")+"outside_top";
else if (pos.testFlag(JKQTPKeyOutsideBottom)) res+=std::string(res.size()>0?"|":"")+"outside_bottom";
else if (pos.testFlag(JKQTPKeyOutsideLeft)) res+=std::string(res.size()>0?"|":"")+"outside_left";
else if (pos.testFlag(JKQTPKeyOutsideRight)) res+=std::string(res.size()>0?"|":"")+"outside_right";
if (pos.testFlag(JKQTPKeyInside)) res+=QString(res.size()>0?"|":"")+"inside";
else if (pos.testFlag(JKQTPKeyOutsideTop)) res+=QString(res.size()>0?"|":"")+"outside_top";
else if (pos.testFlag(JKQTPKeyOutsideBottom)) res+=QString(res.size()>0?"|":"")+"outside_bottom";
else if (pos.testFlag(JKQTPKeyOutsideLeft)) res+=QString(res.size()>0?"|":"")+"outside_left";
else if (pos.testFlag(JKQTPKeyOutsideRight)) res+=QString(res.size()>0?"|":"")+"outside_right";
if (pos.testFlag(JKQTPKeyLeft)) res+=std::string(res.size()>0?"|":"")+"left";
else if (pos.testFlag(JKQTPKeyHCenter)) res+=std::string(res.size()>0?"|":"")+"hcenter";
else if (pos.testFlag(JKQTPKeyRight)) res+=std::string(res.size()>0?"|":"")+"right";
if (pos.testFlag(JKQTPKeyLeft)) res+=QString(res.size()>0?"|":"")+"left";
else if (pos.testFlag(JKQTPKeyHCenter)) res+=QString(res.size()>0?"|":"")+"hcenter";
else if (pos.testFlag(JKQTPKeyRight)) res+=QString(res.size()>0?"|":"")+"right";
if (pos.testFlag(JKQTPKeyTop)) res+=std::string(res.size()>0?"|":"")+"top";
else if (pos.testFlag(JKQTPKeyVCenter)) res+=std::string(res.size()>0?"|":"")+"vcenter";
else if (pos.testFlag(JKQTPKeyBottom)) res+=std::string(res.size()>0?"|":"")+"bottom";
if (pos.testFlag(JKQTPKeyTop)) res+=QString(res.size()>0?"|":"")+"top";
else if (pos.testFlag(JKQTPKeyVCenter)) res+=QString(res.size()>0?"|":"")+"vcenter";
else if (pos.testFlag(JKQTPKeyBottom)) res+=QString(res.size()>0?"|":"")+"bottom";
return res;
}

22
tools/jkqtplotter_doc_imagegenerator/jkqtplotter_doc_imagegenerator.cpp
View File

@ -603,19 +603,19 @@ inline QString JKQTPKeyPosition2CPPString(JKQTPKeyPosition pos) {
}
QString res;
if (pos.testFlag(JKQTPKeyInside)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyInside";
else if (pos.testFlag(JKQTPKeyOutsideTop)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyOutsideTop";
else if (pos.testFlag(JKQTPKeyOutsideBottom)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyOutsideBottom";
else if (pos.testFlag(JKQTPKeyOutsideLeft)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyOutsideLeft";
else if (pos.testFlag(JKQTPKeyOutsideRight)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyOutsideRight";
if (pos.testFlag(JKQTPKeyInside)) res+=QString(res.size()>0?"|":"")+"JKQTPKeyInside";
else if (pos.testFlag(JKQTPKeyOutsideTop)) res+=QString(res.size()>0?"|":"")+"JKQTPKeyOutsideTop";
else if (pos.testFlag(JKQTPKeyOutsideBottom)) res+=QString(res.size()>0?"|":"")+"JKQTPKeyOutsideBottom";
else if (pos.testFlag(JKQTPKeyOutsideLeft)) res+=QString(res.size()>0?"|":"")+"JKQTPKeyOutsideLeft";
else if (pos.testFlag(JKQTPKeyOutsideRight)) res+=QString(res.size()>0?"|":"")+"JKQTPKeyOutsideRight";
if (pos.testFlag(JKQTPKeyLeft)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyLeft";
else if (pos.testFlag(JKQTPKeyHCenter)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyHCenter";
else if (pos.testFlag(JKQTPKeyRight)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyRight";
if (pos.testFlag(JKQTPKeyLeft)) res+=QString(res.size()>0?"|":"")+"JKQTPKeyLeft";
else if (pos.testFlag(JKQTPKeyHCenter)) res+=QString(res.size()>0?"|":"")+"JKQTPKeyHCenter";
else if (pos.testFlag(JKQTPKeyRight)) res+=QString(res.size()>0?"|":"")+"JKQTPKeyRight";
if (pos.testFlag(JKQTPKeyTop)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyTop";
else if (pos.testFlag(JKQTPKeyVCenter)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyVCenter";
else if (pos.testFlag(JKQTPKeyBottom)) res+=std::string(res.size()>0?"|":"")+"JKQTPKeyBottom";
if (pos.testFlag(JKQTPKeyTop)) res+=QString(res.size()>0?"|":"")+"JKQTPKeyTop";
else if (pos.testFlag(JKQTPKeyVCenter)) res+=QString(res.size()>0?"|":"")+"JKQTPKeyVCenter";
else if (pos.testFlag(JKQTPKeyBottom)) res+=QString(res.size()>0?"|":"")+"JKQTPKeyBottom";
return res;
return "";