• R/O
  • SSH
  • HTTPS

magic-txd: Commit


Commit MetaInfo

Revision72 (tree)
Time2020-10-30 05:30:29
Authorquiret

Log Message

- adjustments for the Qt filesystem layer

Change Summary

Incremental Difference

--- src/qtfilesystem.cpp (revision 71)
+++ src/qtfilesystem.cpp (revision 72)
@@ -979,7 +979,7 @@
979979 catch( ... )
980980 {}
981981
982- return 0;
982+ return -1;
983983 }
984984
985985 qint64 readLine( char *data, qint64 maxlen ) noexcept override
@@ -1000,7 +1000,7 @@
10001000 catch( ... )
10011001 {}
10021002
1003- return 0;
1003+ return -1;
10041004 }
10051005
10061006 bool extension( Extension extension, const ExtensionOption *option, ExtensionReturn *output ) noexcept override
@@ -1010,18 +1010,23 @@
10101010 return false;
10111011 }
10121012
1013- try
1013+ if ( extension == QAbstractFileEngine::AtEndExtension )
10141014 {
1015- if ( extension == QAbstractFileEngine::AtEndExtension )
1015+ try
10161016 {
10171017 if ( CFile *dataFile = this->dataFile )
10181018 {
10191019 return dataFile->IsEOF();
10201020 }
1021+ }
1022+ catch( ... )
1023+ {}
10211024
1022- return true;
1023- }
1024- else if ( extension == QAbstractFileEngine::MapExtension )
1025+ return true;
1026+ }
1027+ else if ( extension == QAbstractFileEngine::MapExtension )
1028+ {
1029+ try
10251030 {
10261031 if ( CFile *handle = this->dataFile )
10271032 {
@@ -1053,7 +1058,12 @@
10531058 }
10541059 }
10551060 }
1056- else if ( extension == QAbstractFileEngine::UnMapExtension )
1061+ catch( ... )
1062+ {}
1063+ }
1064+ else if ( extension == QAbstractFileEngine::UnMapExtension )
1065+ {
1066+ try
10571067 {
10581068 if ( CFileMappingProvider *mapProv = this->mem_mappings )
10591069 {
@@ -1064,9 +1074,9 @@
10641074 return couldUnmap;
10651075 }
10661076 }
1077+ catch( ... )
1078+ {}
10671079 }
1068- catch( ... )
1069- {}
10701080
10711081 return false;
10721082 }
Show on old repository browser