Merge lp:~renatofilho/qtorganizer5-eds/no-debug into lp:qtorganizer5-eds

[Renato Araujo Oliveira Filho]

Removed all debug messages.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:46
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/133/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-amd64-ci/122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/120
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-i386-ci/120

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/133/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

=== modified file 'qorganizer/qorganizer-eds-engine.cpp'
--- qorganizer/qorganizer-eds-engine.cpp	2014-04-04 19:29:07 +0000
+++ qorganizer/qorganizer-eds-engine.cpp	2014-04-15 18:23:50 +0000
@@ -69,23 +69,8 @@
 using namespace QtOrganizer;
 QOrganizerEDSEngineData *QOrganizerEDSEngine::m_globalData = 0;
 
-static void QOrganizerEDSEngineMessageOutput(QtMsgType type,
-                                             const QMessageLogContext &context,
-                                             const QString &message)
-{
-    Q_UNUSED(type);
-    Q_UNUSED(context);
-    Q_UNUSED(message);
-    //nothing
-}
-
 QOrganizerEDSEngine* QOrganizerEDSEngine::createEDSEngine(const QMap<QString, QString>& parameters)
 {
-    // disable debug message if variable not exported
-    if (qgetenv("QORGANIZER_EDS_DEBUG").isEmpty()) {
-        qInstallMessageHandler(QOrganizerEDSEngineMessageOutput);
-    }
-
     Q_UNUSED(parameters);
     if (!m_globalData) {
         m_globalData = new QOrganizerEDSEngineData();
@@ -98,7 +83,6 @@
 QOrganizerEDSEngine::QOrganizerEDSEngine(QOrganizerEDSEngineData *data)
     : d(data)
 {
-    qDebug() << Q_FUNC_INFO;
     d->m_sharedEngines << this;
 
     Q_FOREACH(const QString &collectionId, d->m_sourceRegistry->collectionsIds()){
@@ -111,8 +95,6 @@
 
 QOrganizerEDSEngine::~QOrganizerEDSEngine()
 {
-    qDebug() << Q_FUNC_INFO;
-
     Q_FOREACH(QOrganizerAbstractRequest *req, m_runningRequests.keys()) {
         req->cancel();
     }
@@ -140,7 +122,6 @@
 
 void QOrganizerEDSEngine::itemsAsync(QOrganizerItemFetchRequest *req)
 {
-    qDebug() << Q_FUNC_INFO;
     FetchRequestData *data = new FetchRequestData(this,
                                                   d->m_sourceRegistry->collectionsIds(),
                                                   req);
@@ -187,7 +168,6 @@
                                            time_t instanceEnd,
                                            FetchRequestData *data)
 {
-    qDebug() << Q_FUNC_INFO;
     Q_UNUSED(instanceStart);
     Q_UNUSED(instanceEnd);
 
@@ -223,14 +203,12 @@
 
 void QOrganizerEDSEngine::itemsByIdAsync(QOrganizerItemFetchByIdRequest *req)
 {
-    qDebug() << Q_FUNC_INFO;
     FetchByIdRequestData *data = new FetchByIdRequestData(this, req);
     itemsByIdAsyncStart(data);
 }
 
 void QOrganizerEDSEngine::itemsByIdAsyncStart(FetchByIdRequestData *data)
 {
-    qDebug() << Q_FUNC_INFO;
     QString id = data->nextId();
     if (!id.isEmpty()) {
         QStringList ids = id.split("/");
@@ -267,7 +245,6 @@
                                                GAsyncResult *res,
                                                FetchByIdRequestData *data)
 {
-    qDebug() << Q_FUNC_INFO;
     Q_UNUSED(client);
     GError *gError = 0;
     icalcomponent *icalComp = 0;
@@ -289,7 +266,6 @@
 
 void QOrganizerEDSEngine::itemOcurrenceAsync(QOrganizerItemOccurrenceFetchRequest *req)
 {
-    qDebug() << Q_FUNC_INFO;
     FetchOcurrenceData *data = new FetchOcurrenceData(this, req);
 
     QString rId;
@@ -316,7 +292,6 @@
                                                           FetchOcurrenceData *data)
 {
     Q_UNUSED(source);
-
     GError *error = 0;
     icalcomponent *comp = 0;
     e_cal_client_get_object_finish(data->client(), res, &comp, &error);
@@ -343,7 +318,6 @@
                                                    time_t instanceEnd,
                                                    FetchOcurrenceData *data)
 {
-    qDebug() << Q_FUNC_INFO;
     Q_UNUSED(instanceStart);
     Q_UNUSED(instanceEnd);
 
@@ -364,8 +338,6 @@
                                                  QMap<int, QOrganizerManager::Error> *errorMap,
                                                  QOrganizerManager::Error *error)
 {
-    qDebug() << Q_FUNC_INFO;
-
     QOrganizerItemFetchByIdRequest *req = new QOrganizerItemFetchByIdRequest(this);
     req->setIds(itemIds);
     req->setFetchHint(fetchHint);
@@ -392,7 +364,6 @@
                                                  const QOrganizerItemFetchHint &fetchHint,
                                                  QOrganizerManager::Error *error)
 {
-    qDebug() << Q_FUNC_INFO;
     QOrganizerItemFetchRequest *req = new QOrganizerItemFetchRequest(this);
 
     req->setFilter(filter);
@@ -419,8 +390,11 @@
                                                      const QList<QOrganizerItemSortOrder> &sortOrders,
                                                      QOrganizerManager::Error *error)
 {
-    qDebug() << Q_FUNC_INFO;
+    qWarning() << Q_FUNC_INFO << "Not implemented";
     QList<QOrganizerItemId> items;
+    if (error) {
+        *error = QOrganizerManager::NotSupportedError;
+    }
     return items;
 }
 
@@ -431,7 +405,6 @@
                                                            const QOrganizerItemFetchHint &fetchHint,
                                                            QOrganizerManager::Error *error)
 {
-    qDebug() << Q_FUNC_INFO;
     QOrganizerItemOccurrenceFetchRequest *req = new QOrganizerItemOccurrenceFetchRequest(this);
 
     req->setParentItem(parentItem);
@@ -458,13 +431,16 @@
                                                                  const QOrganizerItemFetchHint &fetchHint,
                                                                  QOrganizerManager::Error *error)
 {
-    qDebug() << Q_FUNC_INFO;
+    qWarning() << Q_FUNC_INFO << "Not implemented";
+    if (error) {
+        *error = QOrganizerManager::NotSupportedError;
+    }
     return QList<QOrganizerItem>();
+
 }
 
 void QOrganizerEDSEngine::saveItemsAsync(QOrganizerItemSaveRequest *req)
 {
-    qDebug() << Q_FUNC_INFO;
     if (req->items().count() == 0) {
         QOrganizerManagerEngine::updateItemSaveRequest(req,
                                                        QList<QOrganizerItem>(),
@@ -479,7 +455,6 @@
 
 void QOrganizerEDSEngine::saveItemsAsyncStart(SaveRequestData *data)
 {
-    qDebug() << Q_FUNC_INFO;
     QString collectionId = data->nextCollection();
 
     if (collectionId.isNull() && data->end()) {
@@ -501,12 +476,10 @@
 
         if (collectionId.isEmpty() && createItems) {
             collectionId = data->parent()->d->m_sourceRegistry->defaultCollection().id().toString();
-            qDebug() << "Use default collection to save item with empty collection:" << collectionId;
         }
 
         EClient *client = data->parent()->d->m_sourceRegistry->client(collectionId);
         if (!client) {
-            qWarning() << "Trying to save items with invalid collection" << collectionId;
             Q_FOREACH(const QOrganizerItem &i, items) {
                 data->appendResult(i, QOrganizerManager::InvalidCollectionError);
             }
@@ -547,7 +520,6 @@
                                                 GAsyncResult *res,
                                                 SaveRequestData *data)
 {
-    qDebug() << Q_FUNC_INFO;
     Q_UNUSED(source_object);
 
     GError *gError = 0;
@@ -574,7 +546,6 @@
                                                 GAsyncResult *res,
                                                 SaveRequestData *data)
 {
-    qDebug() << Q_FUNC_INFO;
     Q_UNUSED(source_object);
 
     GError *gError = 0;
@@ -623,7 +594,6 @@
                                     QtOrganizer::QOrganizerManager::Error *error)
 
 {
-    qDebug() << Q_FUNC_INFO;
     QOrganizerItemSaveRequest *req = new QOrganizerItemSaveRequest(this);
     req->setItems(*items);
     req->setDetailMask(detailMask);
@@ -640,7 +610,6 @@
 
 void QOrganizerEDSEngine::removeItemsByIdAsync(QOrganizerItemRemoveByIdRequest *req)
 {
-    qDebug() << Q_FUNC_INFO;
     if (req->itemIds().count() == 0) {
         QOrganizerManagerEngine::updateItemRemoveByIdRequest(req,
                                                              QOrganizerManager::NoError,
@@ -655,7 +624,6 @@
 
 void QOrganizerEDSEngine::removeItemsByIdAsyncStart(RemoveByIdRequestData *data)
 {
-    qDebug() << Q_FUNC_INFO;
     QString collectionId = data->next();
     for(; !collectionId.isNull(); collectionId = data->next()) {
         EClient *client = data->parent()->d->m_sourceRegistry->client(collectionId);
@@ -678,7 +646,6 @@
 
 void QOrganizerEDSEngine::removeItemsAsync(QOrganizerItemRemoveRequest *req)
 {
-    qDebug() << Q_FUNC_INFO;
     if (req->items().count() == 0) {
         QOrganizerManagerEngine::updateItemRemoveRequest(req,
                                                          QOrganizerManager::NoError,
@@ -693,7 +660,6 @@
 
 void QOrganizerEDSEngine::removeItemsAsyncStart(RemoveRequestData *data)
 {
-    qDebug() << Q_FUNC_INFO;
     QOrganizerCollectionId collection = data->next();
     for(; !collection.isNull(); collection = data->next()) {
         EClient *client = data->parent()->d->m_sourceRegistry->client(collection.toString());
@@ -718,8 +684,6 @@
                                       QMap<int, QOrganizerManager::Error> *errorMap,
                                       QOrganizerManager::Error *error)
 {
-    qDebug() << Q_FUNC_INFO;
-
     QOrganizerItemRemoveByIdRequest *req = new QOrganizerItemRemoveByIdRequest(this);
     req->setItemIds(itemIds);
     startRequest(req);
@@ -737,7 +701,7 @@
 
 QOrganizerCollection QOrganizerEDSEngine::defaultCollection(QOrganizerManager::Error* error)
 {
-    qDebug() << Q_FUNC_INFO;
+    qWarning() << Q_FUNC_INFO << "Not implemented";
     if (error) {
         *error = QOrganizerManager::NoError;
     }
@@ -747,7 +711,6 @@
 QOrganizerCollection QOrganizerEDSEngine::collection(const QOrganizerCollectionId& collectionId,
                                                      QOrganizerManager::Error* error)
 {
-    qDebug() << Q_FUNC_INFO;
     QOrganizerCollection collection = d->m_sourceRegistry->collection(collectionId.toString());
     if (collection.id().isNull() && error) {
         *error = QOrganizerManager::DoesNotExistError;
@@ -758,8 +721,6 @@
 
 QList<QOrganizerCollection> QOrganizerEDSEngine::collections(QOrganizerManager::Error* error)
 {
-    qDebug() << Q_FUNC_INFO;
-
     QOrganizerCollectionFetchRequest *req = new QOrganizerCollectionFetchRequest(this);
 
     startRequest(req);
@@ -776,7 +737,6 @@
 
 bool QOrganizerEDSEngine::saveCollection(QOrganizerCollection* collection, QOrganizerManager::Error* error)
 {
-    qDebug() << Q_FUNC_INFO;
     QOrganizerCollectionSaveRequest *req = new QOrganizerCollectionSaveRequest(this);
     req->setCollection(*collection);
 
@@ -795,8 +755,6 @@
 
 void QOrganizerEDSEngine::saveCollectionAsync(QOrganizerCollectionSaveRequest *req)
 {
-    qDebug() << Q_FUNC_INFO;
-
     if (req->collections().count() == 0) {
         QOrganizerManagerEngine::updateCollectionSaveRequest(req,
                                                              QList<QOrganizerCollection>(),
@@ -826,7 +784,6 @@
                                                       GAsyncResult *res,
                                                       SaveCollectionRequestData *data)
 {
-    qDebug() << Q_FUNC_INFO;
     GError *gError = 0;
     e_source_registry_create_sources_finish(registry, res, &gError);
     QCoreApplication::processEvents();
@@ -881,8 +838,6 @@
 
 bool QOrganizerEDSEngine::removeCollection(const QOrganizerCollectionId& collectionId, QOrganizerManager::Error* error)
 {
-    qDebug() << Q_FUNC_INFO;
-
     QOrganizerCollectionRemoveRequest *req = new QOrganizerCollectionRemoveRequest(this);
     req->setCollectionId(collectionId);
 
@@ -895,8 +850,6 @@
 
 void QOrganizerEDSEngine::removeCollectionAsync(QtOrganizer::QOrganizerCollectionRemoveRequest *req)
 {
-    qDebug() << Q_FUNC_INFO;
-
     if (req->collectionIds().count() == 0) {
         QOrganizerManagerEngine::updateCollectionRemoveRequest(req,
                                                              QOrganizerManager::NoError,
@@ -953,7 +906,6 @@
 
 void QOrganizerEDSEngine::requestDestroyed(QOrganizerAbstractRequest* req)
 {
-    qDebug() << Q_FUNC_INFO;
     RequestData *data = m_runningRequests.take(req);
     if (data) {
         delete data;
@@ -962,8 +914,6 @@
 
 bool QOrganizerEDSEngine::startRequest(QOrganizerAbstractRequest* req)
 {
-    qDebug() << Q_FUNC_INFO;
-
     if (!req)
         return false;
 
@@ -1010,7 +960,6 @@
 
 bool QOrganizerEDSEngine::cancelRequest(QOrganizerAbstractRequest* req)
 {
-    qDebug() << Q_FUNC_INFO;
     RequestData *data = m_runningRequests.take(req);
     if (data) {
         data->cancel();
@@ -1022,7 +971,6 @@
 
 bool QOrganizerEDSEngine::waitForRequestFinished(QOrganizerAbstractRequest* req, int msecs)
 {
-    qDebug() << Q_FUNC_INFO;
     Q_ASSERT(req);
     Q_UNUSED(msecs);
 
@@ -1124,13 +1072,11 @@
 
 void QOrganizerEDSEngine::onSourceAdded(const QString &collectionId)
 {
-    qDebug() << Q_FUNC_INFO << collectionId;
     d->watch(collectionId);
 }
 
 void QOrganizerEDSEngine::onSourceRemoved(const QString &collectionId)
 {
-    qDebug() << Q_FUNC_INFO << (void*) this;
     d->unWatch(collectionId);
 }
 
@@ -2107,7 +2053,6 @@
 
 ECalComponent *QOrganizerEDSEngine::parseEventItem(ECalClient *client, const QOrganizerItem &item)
 {
-    qDebug() << Q_FUNC_INFO;
     ECalComponent *comp = createDefaultComponent(client, ICAL_VEVENT_COMPONENT, E_CAL_COMPONENT_EVENT);
 
     parseStartTime(item, comp);
@@ -2121,7 +2066,6 @@
 
 ECalComponent *QOrganizerEDSEngine::parseTodoItem(ECalClient *client, const QOrganizerItem &item)
 {
-    qDebug() << Q_FUNC_INFO;
     ECalComponent *comp = createDefaultComponent(client, ICAL_VTODO_COMPONENT, E_CAL_COMPONENT_TODO);
 
     parseTodoStartTime(item, comp);
@@ -2136,7 +2080,6 @@
 
 ECalComponent *QOrganizerEDSEngine::parseJournalItem(ECalClient *client, const QOrganizerItem &item)
 {
-    qDebug() << Q_FUNC_INFO;
     ECalComponent *comp = createDefaultComponent(client, ICAL_VJOURNAL_COMPONENT, E_CAL_COMPONENT_JOURNAL);
 
     QOrganizerJournalTime jtime = item.detail(QOrganizerItemDetail::TypeJournalTime);

=== modified file 'qorganizer/qorganizer-eds-factory.cpp'
--- qorganizer/qorganizer-eds-factory.cpp	2014-02-25 17:00:58 +0000
+++ qorganizer/qorganizer-eds-factory.cpp	2014-04-15 18:23:50 +0000
@@ -9,28 +9,23 @@
 
 QOrganizerManagerEngine* QOrganizerEDSFactory::engine(const QMap<QString, QString>& parameters, QOrganizerManager::Error* error)
 {
-    qDebug() << Q_FUNC_INFO << "eds";
     Q_UNUSED(error);
-
     return QOrganizerEDSEngine::createEDSEngine(parameters);
 }
 
 QOrganizerItemEngineId* QOrganizerEDSFactory::createItemEngineId(const QMap<QString, QString>& parameters, const QString& idString) const
 {
-    qDebug() << Q_FUNC_INFO;
     Q_UNUSED(parameters);
     return new QOrganizerEDSEngineId(idString);
 }
 
 QOrganizerCollectionEngineId* QOrganizerEDSFactory::createCollectionEngineId(const QMap<QString, QString>& parameters, const QString& idString) const
 {
-    qDebug() << Q_FUNC_INFO;
     Q_UNUSED(parameters);
     return new QOrganizerEDSCollectionEngineId(idString);
 }
 
 QString QOrganizerEDSFactory::managerName() const
 {
-    qDebug() << Q_FUNC_INFO;
     return QString::fromLatin1("eds");
 }

=== modified file 'qorganizer/qorganizer-eds-source-registry.cpp'
--- qorganizer/qorganizer-eds-source-registry.cpp	2014-03-21 18:04:50 +0000
+++ qorganizer/qorganizer-eds-source-registry.cpp	2014-04-15 18:23:50 +0000
@@ -17,8 +17,6 @@
 
 SourceRegistry::~SourceRegistry()
 {
-    qDebug() << Q_FUNC_INFO << (void*) this;
-
     clear();
 
     if (m_sourceRegistry) {
@@ -272,7 +270,6 @@
                                    ESource *source,
                                    SourceRegistry *self)
 {
-    qDebug() << Q_FUNC_INFO << (void*) self;
     Q_UNUSED(registry);
     self->insert(source);
 }
@@ -281,7 +278,6 @@
                                      ESource *source,
                                      SourceRegistry *self)
 {
-    qDebug() << Q_FUNC_INFO << (void*) self;
     Q_UNUSED(registry);
     QString collectionId = self->findCollection(source);
     if (!collectionId.isEmpty() && self->m_collections.contains(collectionId)) {
@@ -297,7 +293,6 @@
                                      ESource *source,
                                      SourceRegistry *self)
 {
-    qDebug() << Q_FUNC_INFO << (void*) self;
     Q_UNUSED(registry);
     self->remove(source);
 }

=== modified file 'qorganizer/qorganizer-eds-viewwatcher.cpp'
--- qorganizer/qorganizer-eds-viewwatcher.cpp	2014-02-25 17:00:58 +0000
+++ qorganizer/qorganizer-eds-viewwatcher.cpp	2014-04-15 18:23:50 +0000
@@ -91,9 +91,6 @@
                        << gError->message;
             g_error_free(gError);
             gError = 0;
-        } else {
-            qDebug() << "Listening for changes on ("
-                     << self->m_collectionId << ")";
         }
     }
     g_clear_object(&self->m_cancellable);
@@ -155,7 +152,6 @@
                                  GSList *objects,
                                  ViewWatcher *self)
 {
-    qDebug() << Q_FUNC_INFO << (void*)self;
     Q_UNUSED(view);
 
     QOrganizerItemChangeSet changeSet;
@@ -167,7 +163,6 @@
                                    GSList *objects,
                                    ViewWatcher *self)
 {
-    qDebug() << Q_FUNC_INFO << (void*)self;
     Q_UNUSED(view);
     QOrganizerItemChangeSet changeSet;
 
@@ -185,7 +180,6 @@
                                     GSList *objects,
                                     ViewWatcher *self)
 {
-    qDebug() << Q_FUNC_INFO << (void*)self;
     Q_UNUSED(view);
 
     QOrganizerItemChangeSet changeSet;