Commit 3c32e3dd authored by pvuorela's avatar pvuorela

Merge branch 'remove_pragma' into 'master'

Remove pragma and adjust the error api

See merge request !94
parents aef99161 c60b9c76
...@@ -22,10 +22,6 @@ ...@@ -22,10 +22,6 @@
#ifndef SOCIALD_BUTEOSYNCFW_P_H #ifndef SOCIALD_BUTEOSYNCFW_P_H
#define SOCIALD_BUTEOSYNCFW_P_H #define SOCIALD_BUTEOSYNCFW_P_H
// Several headers from Buteo SyncFW produce warnings
// This means we cannot use -Werror without wrapping them
// in GCC-specific pragmas to ignore warnings from Buteo.
#pragma GCC system_header
#include <SyncCommonDefs.h> #include <SyncCommonDefs.h>
#include <SyncPluginBase.h> #include <SyncPluginBase.h>
#include <ProfileManager.h> #include <ProfileManager.h>
......
...@@ -236,11 +236,11 @@ void SocialdButeoPlugin::syncStatusChanged() ...@@ -236,11 +236,11 @@ void SocialdButeoPlugin::syncStatusChanged()
emit success(getProfileName(), QString("%1 update succeeded").arg(getProfileName())); emit success(getProfileName(), QString("%1 update succeeded").arg(getProfileName()));
} else if (syncStatus != SocialNetworkSyncAdaptor::Busy) { } else if (syncStatus != SocialNetworkSyncAdaptor::Busy) {
updateResults(Buteo::SyncResults(QDateTime::currentDateTime(), Buteo::SyncResults::SYNC_RESULT_FAILED, Buteo::SyncResults::ABORTED)); updateResults(Buteo::SyncResults(QDateTime::currentDateTime(), Buteo::SyncResults::SYNC_RESULT_FAILED, Buteo::SyncResults::ABORTED));
emit error(getProfileName(), QString("%1 update failed").arg(getProfileName()), Buteo::SyncResults::SYNC_RESULT_FAILED); emit error(getProfileName(), QString("%1 update failed").arg(getProfileName()), Buteo::SyncResults::ABORTED);
} }
} else { } else {
updateResults(Buteo::SyncResults(QDateTime::currentDateTime(), Buteo::SyncResults::SYNC_RESULT_FAILED, Buteo::SyncResults::ABORTED)); updateResults(Buteo::SyncResults(QDateTime::currentDateTime(), Buteo::SyncResults::SYNC_RESULT_FAILED, Buteo::SyncResults::ABORTED));
emit error(getProfileName(), QString("%1 update failed").arg(getProfileName()), Buteo::SyncResults::SYNC_RESULT_FAILED); emit error(getProfileName(), QString("%1 update failed").arg(getProfileName()), Buteo::SyncResults::ABORTED);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment