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/callbackhandler.h | |
| 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/callbackhandler.h')
| -rw-r--r-- | kitchensync/libqopensync/callbackhandler.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kitchensync/libqopensync/callbackhandler.h b/kitchensync/libqopensync/callbackhandler.h index a2a4c6d13..fa6b97c60 100644 --- a/kitchensync/libqopensync/callbackhandler.h +++ b/kitchensync/libqopensync/callbackhandler.h @@ -76,10 +76,10 @@ class CallbackHandler : public QObject class EngineEvent; class MemberEvent; - static void conflict_callback( OSyncEngine*, OSyncMappingEngine*, void* ); - static void change_callback( OSyncChangeUpdate*, void* ); + static void conflict_callback( OSyncEngine*, OSyncMapping*, void* ); + static void change_callback( OSyncEngine*, OSyncChangeUpdate*, void* ); static void mapping_callback( OSyncMappingUpdate*, void* ); - static void engine_callback( OSyncEngineUpdate*, void* ); + static void engine_callback( OSyncEngine*, OSyncEngineUpdate*, void* ); static void member_callback( OSyncMemberUpdate*, void* ); Engine* mEngine; |