From: <svn...@op...> - 2010-11-03 08:18:25
|
Author: deloptes Date: Wed Nov 3 09:18:17 2010 New Revision: 6152 URL: http://www.opensync.org/changeset/6152 Log: - forgot to remove some testing code Modified: plugins/akonadi-sync/trunk/src/akonadisink.cpp plugins/akonadi-sync/trunk/src/akonadisink.h plugins/akonadi-sync/trunk/src/sinkbase.h Modified: plugins/akonadi-sync/trunk/src/akonadisink.cpp ============================================================================== --- plugins/akonadi-sync/trunk/src/akonadisink.cpp Wed Nov 3 09:11:10 2010 (r6151) +++ plugins/akonadi-sync/trunk/src/akonadisink.cpp Wed Nov 3 09:18:17 2010 (r6152) @@ -30,10 +30,6 @@ AkonadiSink::~AkonadiSink() { -// Q_FOREACH (DataSink *ds, m_SinkList) { -// delete ds; -// } -// m_SinkList.clear(); } bool AkonadiSink::initialize(OSyncPlugin * plugin, OSyncPluginInfo * info, OSyncError ** error) @@ -47,18 +43,12 @@ return true; } -// void AkonadiSink::setSink(OSyncObjTypeSink *sink) -// { -// -// } - void AkonadiSink::connect() { osync_trace(TRACE_ENTRY, "%s(%p, %p)", __PRETTY_FUNCTION__, pluginInfo(), context()); kDebug(); -// OSyncError *oerror = 0; + if ( !Akonadi::Control::start() ) { -// osync_error_set_type(&oerror,OSYNC_ERROR_NO_CONNECTION); kDebug() << "Could not start Akonadi." ; error( OSYNC_ERROR_NO_CONNECTION, "Could not start Akonadi." ); osync_trace(TRACE_EXIT_ERROR, "%s: %s", __PRETTY_FUNCTION__, "Could not start Akonadi."); @@ -69,11 +59,4 @@ osync_trace(TRACE_EXIT, "%s", __PRETTY_FUNCTION__); } -// void AkonadiSink::addSink(DataSink* ds) -// { -// Q_ASSERT(ds == 0 ); -// m_SinkList.append(ds); -// } - - #include "akonadisink.moc" Modified: plugins/akonadi-sync/trunk/src/akonadisink.h ============================================================================== --- plugins/akonadi-sync/trunk/src/akonadisink.h Wed Nov 3 09:11:10 2010 (r6151) +++ plugins/akonadi-sync/trunk/src/akonadisink.h Wed Nov 3 09:18:17 2010 (r6152) @@ -19,7 +19,7 @@ #ifndef AKONADISINK_H #define AKONADISINK_H -// #include "datasink.h" + #include "sinkbase.h" /** @@ -36,11 +36,7 @@ bool initialize( OSyncPlugin *plugin, OSyncPluginInfo *info, OSyncError **error ); void connect(); - -// void addSink(DataSink* ds); - -// private: -// QList<DataSink*> m_SinkList; + }; #endif Modified: plugins/akonadi-sync/trunk/src/sinkbase.h ============================================================================== --- plugins/akonadi-sync/trunk/src/sinkbase.h Wed Nov 3 09:11:10 2010 (r6151) +++ plugins/akonadi-sync/trunk/src/sinkbase.h Wed Nov 3 09:18:17 2010 (r6152) @@ -83,7 +83,6 @@ OSyncObjTypeSink* sink() const { return mSink; } -// bool m_isContact, m_isEvent, m_isTodo, m_isNote, m_isJournal; //TODO intended to be private private: |