From ecdc49a305e1eaa3ca566ef0c591b202cf59afda Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 19 Nov 2020 15:22:05 +0000 Subject: [PATCH] EgtExchange 2.2k3 : - corrette CreateBeamMgr, CreateExport*, CreateImport* in caso di errore ora restituiscono nullptr. --- BeamMgr.cpp | 2 +- EgtExchange.rc | Bin 11678 -> 11678 bytes ExportDxf.cpp | 2 +- ExportStl.cpp | 2 +- ExportSvg.cpp | 2 +- ImportBtl.cpp | 2 +- ImportCnc.cpp | 2 +- ImportCsf.cpp | 2 +- ImportDxf.cpp | 2 +- ImportPnt.cpp | 2 +- ImportStl.cpp | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) diff --git a/BeamMgr.cpp b/BeamMgr.cpp index aff5b04..1204c2d 100644 --- a/BeamMgr.cpp +++ b/BeamMgr.cpp @@ -30,7 +30,7 @@ CreateBeamMgr( void) { // verifico la chiave e le opzioni if ( ! TestKeyForEEx( GetEExKey(), KEYOPT_EEX_INPADV, GetEExLogger())) - return false ; + return nullptr ; // creo l'oggetto return static_cast ( new(nothrow) BeamMgr) ; } diff --git a/EgtExchange.rc b/EgtExchange.rc index de404197dc5b593808ddce8893992c51d9b0e9f6..5a2538ed6c223e10143fd9c7954cba69a55c0066 100644 GIT binary patch delta 102 zcmbOiJuiC0A2vqg%@6qwGELscnZsy2c_X*(W(Of3#?4E(ZJ5DQhCm7`+`)oFae*|Z MVn4>sQOYh{05{4ZTmS$7 delta 110 zcmbOiJuiC0A2vp#%@6qwGELscnKQYFM`CgTr`To(As@!gOSo;A!IFl|ND>_^I5iYV OW7FWrxH(GMg$n>yy(7c` diff --git a/ExportDxf.cpp b/ExportDxf.cpp index 41940c4..029587c 100644 --- a/ExportDxf.cpp +++ b/ExportDxf.cpp @@ -47,7 +47,7 @@ CreateExportDxf( void) { // verifico la chiave e le opzioni if ( ! TestKeyForEEx( GetEExKey(), KEYOPT_EEX_EXPBASE, GetEExLogger())) - return false ; + return nullptr ; // creo l'oggetto return static_cast ( new(nothrow) ExportDxf) ; } diff --git a/ExportStl.cpp b/ExportStl.cpp index 57cdade..b8ddcdc 100644 --- a/ExportStl.cpp +++ b/ExportStl.cpp @@ -35,7 +35,7 @@ CreateExportStl( void) { // verifico la chiave e le opzioni if ( ! TestKeyForEEx( GetEExKey(), KEYOPT_EEX_EXPBASE, GetEExLogger())) - return false ; + return nullptr ; // creo l'oggetto return static_cast ( new(nothrow) ExportStl) ; } diff --git a/ExportSvg.cpp b/ExportSvg.cpp index c756fdb..f295b37 100644 --- a/ExportSvg.cpp +++ b/ExportSvg.cpp @@ -42,7 +42,7 @@ CreateExportSvg( void) { // verifico la chiave e le opzioni if ( ! TestKeyForEEx( GetEExKey(), KEYOPT_EEX_EXPBASE, GetEExLogger())) - return false ; + return nullptr ; // creo l'oggetto return static_cast ( new(nothrow) ExportSvg) ; } diff --git a/ImportBtl.cpp b/ImportBtl.cpp index 6254dbc..f69dea8 100644 --- a/ImportBtl.cpp +++ b/ImportBtl.cpp @@ -70,7 +70,7 @@ CreateImportBtl( void) { // verifico la chiave e le opzioni if ( ! TestKeyForEEx( GetEExKey(), KEYOPT_EEX_INPADV, GetEExLogger())) - return false ; + return nullptr ; // creo l'oggetto return static_cast ( new(nothrow) ImportBtl) ; } diff --git a/ImportCnc.cpp b/ImportCnc.cpp index 480bb9c..ac7699f 100644 --- a/ImportCnc.cpp +++ b/ImportCnc.cpp @@ -53,7 +53,7 @@ CreateImportCnc( void) { // verifico la chiave e le opzioni if ( ! TestKeyForEEx( GetEExKey(), KEYOPT_EEX_INPBASE, GetEExLogger())) - return false ; + return nullptr ; // creo l'oggetto return static_cast ( new(nothrow) ImportCnc) ; } diff --git a/ImportCsf.cpp b/ImportCsf.cpp index 4dcc8ff..cbe42bb 100644 --- a/ImportCsf.cpp +++ b/ImportCsf.cpp @@ -63,7 +63,7 @@ CreateImportCsf( void) { // verifico la chiave e le opzioni if ( ! TestKeyForEEx( GetEExKey(), KEYOPT_EEX_INPBASE, GetEExLogger())) - return false ; + return nullptr ; // creo l'oggetto return static_cast ( new(nothrow) ImportCsf) ; } diff --git a/ImportDxf.cpp b/ImportDxf.cpp index 1e3e12f..ae03a6e 100644 --- a/ImportDxf.cpp +++ b/ImportDxf.cpp @@ -31,7 +31,7 @@ CreateImportDxf( void) { // verifico la chiave e le opzioni if ( ! TestKeyForEEx( GetEExKey(), KEYOPT_EEX_INPBASE, GetEExLogger())) - return false ; + return nullptr ; // creo l'oggetto return static_cast ( new(nothrow) ImportDxf) ; } diff --git a/ImportPnt.cpp b/ImportPnt.cpp index 56b60dd..93c9e39 100644 --- a/ImportPnt.cpp +++ b/ImportPnt.cpp @@ -29,7 +29,7 @@ CreateImportPnt( void) { // verifico la chiave e le opzioni if ( ! TestKeyForEEx( GetEExKey(), KEYOPT_EEX_INPBASE, GetEExLogger())) - return false ; + return nullptr ; // creo l'oggetto return static_cast ( new(nothrow) ImportPnt) ; } diff --git a/ImportStl.cpp b/ImportStl.cpp index 31fb5e0..3b39c41 100644 --- a/ImportStl.cpp +++ b/ImportStl.cpp @@ -35,7 +35,7 @@ CreateImportStl( void) { // verifico la chiave e le opzioni if ( ! TestKeyForEEx( GetEExKey(), KEYOPT_EEX_INPBASE, GetEExLogger())) - return false ; + return nullptr ; // creo l'oggetto return static_cast ( new(nothrow) ImportStl) ; }