Sync some libdxfrw files with the upstream versions

Syncs some files with their counterparts from https://github.com/LibreCAD/libdxfrw Basically this undoes the QGIS specific styling applied to these files and excludes them from the astyle script. Apart from the whitespace changes there's only very minor code modernization changes. But the goal here is to reduce the diffs between us and upstream so that we can more easily push fixes upstream and pull them downstream.
qgis · Aug 5, 2021 · 52b9c02 · 52b9c02
1 parent 298c78f
commit 52b9c02
Show file tree

Hide file tree

Showing 8 changed files with 62,326 additions and 62,494 deletions.
diff --git a/external/libdxfrw/intern/drw_cptable932.h b/external/libdxfrw/intern/drw_cptable932.h
diff --git a/external/libdxfrw/intern/drw_cptable936.h b/external/libdxfrw/intern/drw_cptable936.h
diff --git a/external/libdxfrw/intern/drw_cptable949.h b/external/libdxfrw/intern/drw_cptable949.h
diff --git a/external/libdxfrw/intern/drw_cptable950.h b/external/libdxfrw/intern/drw_cptable950.h
diff --git a/external/libdxfrw/intern/drw_cptables.h b/external/libdxfrw/intern/drw_cptables.h
diff --git a/external/libdxfrw/intern/drw_textcodec.cpp b/external/libdxfrw/intern/drw_textcodec.cpp
diff --git a/external/libdxfrw/intern/drw_textcodec.h b/external/libdxfrw/intern/drw_textcodec.h
@@ -2,98 +2,94 @@
 #define DRW_TEXTCODEC_H
 
 #include <string>
+#include <memory>
 
 class DRW_Converter;
 
 class DRW_TextCodec
 {
-  public:
+public:
     DRW_TextCodec();
     ~DRW_TextCodec();
-    std::string fromUtf8( std::string s );
-    std::string toUtf8( std::string s );
-    int getVersion() {return version;}
-    void setVersion( std::string *v, bool dxfFormat );
-    void setVersion( int v, bool dxfFormat );
-    void setCodePage( std::string *c, bool dxfFormat );
-    void setCodePage( std::string c, bool dxfFormat ) {setCodePage( &c, dxfFormat );}
-    std::string getCodePage() {return cp;}
+    std::string fromUtf8(std::string s);
+    std::string toUtf8(std::string s);
+    int getVersion(){return version;}
+    void setVersion(std::string *v, bool dxfFormat);
+    void setVersion(int v, bool dxfFormat);
+    void setCodePage(std::string *c, bool dxfFormat);
+    void setCodePage(std::string c, bool dxfFormat){setCodePage(&c, dxfFormat);}
+    std::string getCodePage(){return cp;}
 
-  private:
-    std::string correctCodePage( const std::string &s );
+private:
+    std::string correctCodePage(const std::string& s);
 
-  private:
+private:
     int version;
     std::string cp;
-    DRW_Converter *conv = nullptr;
+    std::unique_ptr< DRW_Converter> conv;
 };
 
 class DRW_Converter
 {
-  public:
-    DRW_Converter( const int *t, int l )
-    {
-      table = t;
-      cpLength = l;
-    }
-    virtual ~DRW_Converter() = default;
-    virtual std::string fromUtf8( std::string *s ) {return *s;}
-    virtual std::string toUtf8( std::string *s );
-    std::string encodeText( std::string stmp );
-    std::string decodeText( int c );
-    std::string encodeNum( int c );
-    int decodeNum( std::string s, int *b );
+public:
+    DRW_Converter(const int *t, int l)
+        :table{t }
+        ,cpLength{l}
+    {}
+    virtual ~DRW_Converter(){}
+    virtual std::string fromUtf8(std::string *s) {return *s;}
+    virtual std::string toUtf8(std::string *s);
+    std::string encodeText(std::string stmp);
+    std::string decodeText(int c);
+    std::string encodeNum(int c);
+    int decodeNum(std::string s, int *b);
     const int *table = nullptr;
     int cpLength;
 };
 
-class DRW_ConvUTF16 : public DRW_Converter
-{
-  public:
-    DRW_ConvUTF16(): DRW_Converter( nullptr, 0 ) {}
-    virtual std::string fromUtf8( std::string *s );
-    virtual std::string toUtf8( std::string *s );
+class DRW_ConvUTF16 : public DRW_Converter {
+public:
+    DRW_ConvUTF16():DRW_Converter(nullptr, 0) {}
+    virtual std::string fromUtf8(std::string *s);
+    virtual std::string toUtf8(std::string *s);
 };
 
-class DRW_ConvTable : public DRW_Converter
-{
-  public:
-    DRW_ConvTable( const int *t, int l ): DRW_Converter( t, l ) {}
-    virtual std::string fromUtf8( std::string *s );
-    virtual std::string toUtf8( std::string *s );
+class DRW_ConvTable : public DRW_Converter {
+public:
+    DRW_ConvTable(const int *t, int l):DRW_Converter(t, l) {}
+    virtual std::string fromUtf8(std::string *s);
+    virtual std::string toUtf8(std::string *s);
 };
 
-class DRW_ConvDBCSTable : public DRW_Converter
-{
-  public:
-    DRW_ConvDBCSTable( const int *t,  const int *lt, const int dt[][2], int l ): DRW_Converter( t, l )
-    {
-      leadTable = lt;
-      doubleTable = dt;
-    }
+class DRW_ConvDBCSTable : public DRW_Converter {
+public:
+    DRW_ConvDBCSTable(const int *t,  const int *lt, const int dt[][2], int l)
+        :DRW_Converter(t, l)
+        ,leadTable{lt}
+        ,doubleTable{dt}
+    {}
 
-    virtual std::string fromUtf8( std::string *s );
-    virtual std::string toUtf8( std::string *s );
-  private:
-    const int *leadTable = nullptr;
-    const int ( *doubleTable )[2];
+    virtual std::string fromUtf8(std::string *s);
+    virtual std::string toUtf8(std::string *s);
+private:
+    const int *leadTable;
+    const int (*doubleTable)[2];
 
 };
 
-class DRW_Conv932Table : public DRW_Converter
-{
-  public:
-    DRW_Conv932Table( const int *t,  const int *lt, const int dt[][2], int l ): DRW_Converter( t, l )
-    {
-      leadTable = lt;
-      doubleTable = dt;
-    }
+class DRW_Conv932Table : public DRW_Converter {
+public:
+    DRW_Conv932Table(const int *t,  const int *lt, const int dt[][2], int l)
+        :DRW_Converter(t, l)
+        ,leadTable{lt}
+        ,doubleTable{dt}
+    {}
 
-    virtual std::string fromUtf8( std::string *s );
-    virtual std::string toUtf8( std::string *s );
-  private:
-    const int *leadTable = nullptr;
-    const int ( *doubleTable )[2];
+    virtual std::string fromUtf8(std::string *s);
+    virtual std::string toUtf8(std::string *s);
+private:
+    const int *leadTable;
+    const int (*doubleTable)[2];
 
 };
 

diff --git a/scripts/astyle.sh b/scripts/astyle.sh
@@ -105,7 +105,7 @@ astyleit() {
 
 for f in "$@"; do
 	case "$f" in
-                src/plugins/grass/qtermwidget/*|external/untwine/*|external/qwt*|external/o2/*|external/odbccpp/*|external/qt-unix-signals/*|external/rtree/*|external/astyle/*|external/kdbush/*|external/poly2tri/*|external/wintoast/*|external/qt3dextra-headers/*|external/laz-perf/*|external/meshOptimizer/*|external/mapbox-vector-tile/*|python/ext-libs/*|ui_*.py|*.astyle|tests/testdata/*|editors/*)
+                src/plugins/grass/qtermwidget/*|external/libdxfrw/*|external/untwine/*|external/qwt*|external/o2/*|external/odbccpp/*|external/qt-unix-signals/*|external/rtree/*|external/astyle/*|external/kdbush/*|external/poly2tri/*|external/wintoast/*|external/qt3dextra-headers/*|external/laz-perf/*|external/meshOptimizer/*|external/mapbox-vector-tile/*|python/ext-libs/*|ui_*.py|*.astyle|tests/testdata/*|editors/*)
 			echo -ne "$f skipped $elcr"
 			continue
 			;;