diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-08 01:37:34 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-08 01:37:34 +0000 |
commit | d4f48636cc2631625434326e146d04f503d0247a (patch) | |
tree | a371a2337bddce3de3fa3fcac52275a8204570d9 /kitchensync/libqopensync/engine.cpp | |
parent | d8b40941f9d1a221add0b9094eb09405a91a8aab (diff) | |
download | tdepim-d4f48636cc2631625434326e146d04f503d0247a.tar.gz tdepim-d4f48636cc2631625434326e146d04f503d0247a.zip |
Reverse OpenSync patch as it causes a build failure on Debian
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1172771 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kitchensync/libqopensync/engine.cpp')
-rw-r--r-- | kitchensync/libqopensync/engine.cpp | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/kitchensync/libqopensync/engine.cpp b/kitchensync/libqopensync/engine.cpp index 64a11f0ed..6d48c72ff 100644 --- a/kitchensync/libqopensync/engine.cpp +++ b/kitchensync/libqopensync/engine.cpp @@ -20,11 +20,7 @@ */ #include <opensync/opensync.h> -#include <opensync/opensync-engine.h> - -#include "group.h" -#include "member.h" -#include "result.h" +#include <osengine/engine.h> #include "engine.h" @@ -33,21 +29,19 @@ using namespace QSync; Engine::Engine( const Group &group ) { OSyncError *error = 0; - mEngine = osync_engine_new( group.mGroup, &error ); + mEngine = osengine_new( group.mGroup, &error ); } Engine::~Engine() { - osync_engine_unref( mEngine ); + osengine_free( mEngine ); mEngine = 0; } Result Engine::initialize() { - Q_ASSERT( mEngine ); - OSyncError *error = 0; - if ( !osync_engine_initialize ( mEngine, &error ) ) + if ( !osengine_init( mEngine, &error ) ) return Result( &error ); else return Result(); @@ -55,29 +49,13 @@ Result Engine::initialize() void Engine::finalize() { - Q_ASSERT( mEngine ); - - OSyncError *error = 0; - osync_engine_finalize( mEngine , &error ); + osengine_finalize( mEngine ); } Result Engine::synchronize() { - Q_ASSERT( mEngine ); - OSyncError *error = 0; - if ( !osync_engine_synchronize( mEngine, &error ) ) - return Result( &error ); - else - return Result(); -} - -Result Engine::discover( const Member &member ) -{ - Q_ASSERT( mEngine ); - - OSyncError *error = 0; - if ( !osync_engine_discover_and_block( mEngine, member.mMember, &error ) ) + if ( !osengine_synchronize( mEngine, &error ) ) return Result( &error ); else return Result(); @@ -85,9 +63,5 @@ Result Engine::discover( const Member &member ) void Engine::abort() { - Q_ASSERT( mEngine ); - -// TODO -// osync_engine_abort( mEngine ); + osengine_abort( mEngine ); } - |