[Pkg-owncloud-commits] [owncloud-client] 247/470: Merge pull request #4615 from owncloud/socketApiRefactor

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit cdbc25ede86f35cf10b46b44b307ac08faafe447
Merge: 98995f4 a0260c2
Author: Olivier Goffart <olivier at woboq.com>
Date:   Wed Mar 30 13:24:10 2016 +0200

    Merge pull request #4615 from owncloud/socketApiRefactor
    
    Socket API refactor

 src/gui/accountmanager.h              |   2 -
 src/gui/accountsettings.cpp           |   1 +
 src/gui/accountstate.h                |   6 +-
 src/gui/folder.cpp                    | 310 ++++++++--------------------------
 src/gui/folder.h                      |  41 ++---
 src/gui/folderman.cpp                 |  64 +++----
 src/gui/folderman.h                   |   5 +-
 src/gui/owncloudgui.cpp               |   3 +-
 src/gui/owncloudgui.h                 |   1 -
 src/gui/selectivesyncdialog.cpp       |  13 +-
 src/gui/socketapi.cpp                 | 303 ++-------------------------------
 src/gui/socketapi.h                   |  13 +-
 src/libsync/CMakeLists.txt            |   1 +
 src/libsync/accountfwd.h              |   2 +-
 src/libsync/excludedfiles.cpp         |  27 +--
 src/libsync/excludedfiles.h           |  14 +-
 src/libsync/progressdispatcher.h      |   2 -
 src/libsync/syncengine.cpp            |  42 ++---
 src/libsync/syncengine.h              |  14 +-
 src/libsync/syncfilestatus.cpp        |  22 +--
 src/libsync/syncfilestatus.h          |  17 +-
 src/libsync/syncfilestatustracker.cpp | 204 ++++++++++++++++++++++
 src/libsync/syncfilestatustracker.h   |  57 +++++++
 src/libsync/utility.cpp               |  12 --
 src/libsync/utility.h                 |   5 -
 test/testfolderman.h                  |   6 +-
 26 files changed, 457 insertions(+), 730 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git