diff options
author | Daniel Molkentin <danimo@owncloud.com> | 2014-10-29 06:18:16 +0300 |
---|---|---|
committer | Daniel Molkentin <danimo@owncloud.com> | 2014-10-29 06:27:58 +0300 |
commit | dc1e73dcb7145c59c455c612e3769cc2412e67fe (patch) | |
tree | 64daeaaa515ed4cf799694d524c85a257c04bf7a /src/gui/socketapi.h | |
parent | 24b07aaaef76c77df3b0422c68c837fdba0c20e5 (diff) | |
parent | 782463589e4d3062c4c23b39c8cdb4764db89e52 (diff) |
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/libsync/syncjournaldb.cpp
test/CMakeLists.txt
Diffstat (limited to 'src/gui/socketapi.h')
-rw-r--r-- | src/gui/socketapi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/socketapi.h b/src/gui/socketapi.h index 753c0bcb6..f5f5a63f1 100644 --- a/src/gui/socketapi.h +++ b/src/gui/socketapi.h @@ -65,7 +65,6 @@ private slots: private: SyncFileStatus fileStatus(Folder *folder, const QString& systemFileName, c_strlist_t *excludes ); - SyncJournalFileRecord dbFileRecord( Folder *folder, QString fileName ); SyncJournalFileRecord dbFileRecord_capi( Folder *folder, QString fileName ); SyncFileStatus recursiveFolderStatus(Folder *folder, const QString& fileName, c_strlist_t *excludes ); SqlQuery *getSqlQuery( Folder *folder ); |