equal
deleted
inserted
replaced
123 mErrString = fileName; |
123 mErrString = fileName; |
124 ret = FmErrCannotRemove; |
124 ret = FmErrCannotRemove; |
125 } |
125 } |
126 IncreaseProgressOnce(); |
126 IncreaseProgressOnce(); |
127 } else if (fi.isDir()) { |
127 } else if (fi.isDir()) { |
128 if( FmUtils::isDefaultFolder( fileName ) ){ |
128 ret = recursiveRemoveDir( fileName ); |
129 ret = FmErrRemoveDefaultFolder; |
|
130 } |
|
131 else{ |
|
132 ret = recursiveRemoveDir( fileName ); |
|
133 } |
|
134 |
|
135 |
|
136 } else { |
129 } else { |
137 qWarning( "Things other than file and directory are not copied" ); |
130 qWarning( "Things other than file and directory are not copied" ); |
138 ret = FmErrIsNotFileOrFolder; |
131 ret = FmErrIsNotFileOrFolder; |
139 } |
132 } |
140 return ret; |
133 return ret; |