Refactoring.

Code style.

src/libs/vdxf/dxiface.cpp

@@ -10,14 +10,15 @@
 ******************************************************************************/
 
 #include "dxiface.h"
-#include "libdxfrw/libdxfrw.h"
 #include "../vmisc/vabstractapplication.h"
+#include "libdxfrw/libdxfrw.h"
+#include "vdxf/libdxfrw/drw_entities.h"
 
-#include <iostream>
-#include <algorithm>
 #include <QDateTime>
 #include <QFont>
 #include <QLocale>
+#include <algorithm>
+#include <iostream>
 
 dx_iface::dx_iface(const std::string &file, DRW::Version v, VarMeasurement varMeasurement, VarInsunits varInsunits)
   : dxfW(new dxfRW(file.c_str())),
@@ -41,8 +42,10 @@ auto dx_iface::fileExport(bool binary) -> bool
     return success;
 }
 
-void dx_iface::writeEntity(DRW_Entity* e){
+void dx_iface::writeEntity(DRW_Entity *e)
-    switch (e->eType) {
+{
+    switch (e->eType)
+    {
         case DRW::POINT:
             dxfW->writePoint(static_cast<DRW_Point *>(e));
             break;
@@ -115,7 +118,8 @@ auto dx_iface::ErrorString() const -> std::string
     return dxfW->ErrorString();
 }
 
-void dx_iface::writeHeader(DRW_Header &data){
+void dx_iface::writeHeader(DRW_Header &data)
+{
     // complete copy of header vars:
     data = cData.headerC;
     // or copy one by one:
@@ -123,9 +127,11 @@ void dx_iface::writeHeader(DRW_Header &data){
     //             data.vars[it->first] = new DRW_Variant( *(it->second) );
 }
 
-void dx_iface::writeBlocks(){
+void dx_iface::writeBlocks()
+{
     // write each block
-    for (auto *bk : cData.blocks){
+    for (auto *bk : cData.blocks)
+    {
         dxfW->writeBlock(bk);
         // and write each entity in block
         for (std::list<DRW_Entity *>::const_iterator it = bk->ent.begin(); it != bk->ent.end(); ++it)
@@ -133,37 +139,44 @@ void dx_iface::writeBlocks(){
     }
 }
 
-void dx_iface::writeBlockRecords(){
+void dx_iface::writeBlockRecords()
+{
     for (std::list<dx_ifaceBlock *>::iterator it = cData.blocks.begin(); it != cData.blocks.end(); ++it)
         dxfW->writeBlockRecord((*it)->name);
 }
 
-void dx_iface::writeEntities(){
+void dx_iface::writeEntities()
+{
     for (std::list<DRW_Entity *>::const_iterator it = cData.mBlock->ent.begin(); it != cData.mBlock->ent.end(); ++it)
         writeEntity(*it);
 }
 
-void dx_iface::writeLTypes(){
+void dx_iface::writeLTypes()
+{
     for (std::list<DRW_LType>::iterator it = cData.lineTypes.begin(); it != cData.lineTypes.end(); ++it)
         dxfW->writeLineType(&(*it));
 }
 
-void dx_iface::writeLayers(){
+void dx_iface::writeLayers()
+{
     for (std::list<DRW_Layer>::iterator it = cData.layers.begin(); it != cData.layers.end(); ++it)
         dxfW->writeLayer(&(*it));
 }
 
-void dx_iface::writeTextstyles(){
+void dx_iface::writeTextstyles()
+{
     for (std::list<DRW_Textstyle>::iterator it = cData.textStyles.begin(); it != cData.textStyles.end(); ++it)
         dxfW->writeTextstyle(&(*it));
 }
 
-void dx_iface::writeVports(){
+void dx_iface::writeVports()
+{
     for (std::list<DRW_Vport>::iterator it = cData.VPorts.begin(); it != cData.VPorts.end(); ++it)
         dxfW->writeVport(&(*it));
 }
 
-void dx_iface::writeDimstyles(){
+void dx_iface::writeDimstyles()
+{
     for (std::list<DRW_Dimstyle>::iterator it = cData.dimStyles.begin(); it != cData.dimStyles.end(); ++it)
         dxfW->writeDimstyle(&(*it));
 }
@@ -173,7 +186,8 @@ void dx_iface::writeObjects()
     // default implementation for new DRW_Interface method
 }
 
-void dx_iface::writeAppId(){
+void dx_iface::writeAppId()
+{
     for (auto it = cData.appIds.begin(); it != cData.appIds.end(); ++it)
         dxfW->writeAppId(&(*it));
 }
@@ -483,6 +497,6 @@ void dx_iface::AddBlock(dx_ifaceBlock *block)
 auto dx_iface::LocaleToISO() -> std::string
 {
     QMap<QString, QString> locMap = LocaleMap();
-    return locMap.value(QLocale(VAbstractApplication::VApp()->Settings()->GetLocale()).name(),
+    return locMap.value(QLocale(VAbstractApplication::VApp()->Settings()->GetLocale()).name(), "ISO8859-1")
-                        "ISO8859-1").toStdString();
+        .toStdString();
 }

src/libs/vdxf/libdxfrw/drw_entities.cpp

@@ -1348,10 +1348,8 @@ auto DRW_Viewport::parseCode(int code, const std::unique_ptr<dxfReader> &reader)
             vpID = reader->getInt32();
             break;
         case 12:
-        {
             centerPX = reader->getDouble();
             break;
-        }
         case 22:
             centerPY = reader->getDouble();
             break;

src/libs/vdxf/libdxfrw/intern/dxfreader.h

@@ -55,7 +55,7 @@ public:
     auto getDouble() const -> double { return doubleData; }
     auto getInt32() const -> int { return intData; }
     auto getInt64() const -> unsigned long long int { return int64; }
-    auto getBool() const -> bool { return (intData == 0) ? false : true; }
+    auto getBool() const -> bool { return intData != 0; }
     auto getVersion() const -> int { return decoder.getVersion(); }
     void setVersion(const std::string &v, bool dxfFormat) { decoder.setVersion(v, dxfFormat); }
     void setCodePage(const std::string &c) { decoder.setCodePage(c, true); }