diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-06-23 14:48:34 +0400 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2014-06-23 14:48:34 +0400 |
| commit | 02704cdf74e8502884907e1fb14da1348016e59c (patch) | |
| tree | 8c4ea3dc2179536789807a02da407908fe96f770 /src/mirall/syncfileitem.h | |
| parent | 71a901a24e4ff5564337e91c6a62177d764e64b9 (diff) | |
| parent | a7d251f8fcd7f317088f10b0e4ac5bcb177e196e (diff) | |
Merge remote-tracking branch 'origin/1.6' into il
Conflicts:
VERSION.cmake
csync/src/csync_statedb.c
src/mirall/syncengine.cpp
src/mirall/syncfileitem.h
Diffstat (limited to 'src/mirall/syncfileitem.h')
| -rw-r--r-- | src/mirall/syncfileitem.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mirall/syncfileitem.h b/src/mirall/syncfileitem.h index 2dc882ac0..30d3c2730 100644 --- a/src/mirall/syncfileitem.h +++ b/src/mirall/syncfileitem.h @@ -49,8 +49,9 @@ public: FileIgnored ///< The file is in the ignored list }; - SyncFileItem() : _type(UnknownType), _direction(None), _instruction(CSYNC_INSTRUCTION_NONE), - _size(0), _should_update_etag(false), _blacklistedInDb(false), + SyncFileItem() : _type(UnknownType), _direction(None), _isDirectory(false), + _instruction(CSYNC_INSTRUCTION_NONE), _modtime(0), + _size(0), _inode(0), _should_update_etag(false), _blacklistedInDb(false), _status(NoStatus), _httpErrorCode(0), _requestDuration(0), _isRestoration(false) {} friend bool operator==(const SyncFileItem& item1, const SyncFileItem& item2) { |