Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'remove_pragma' into 'master'
Remove pragma and adjust the error api

See merge request mer-core/buteo-sync-plugins-social!94
  • Loading branch information
pvuorela committed Apr 9, 2021
2 parents aef9916 + c60b9c7 commit 3c32e3d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 0 additions & 4 deletions src/common/buteosyncfw_p.h
Expand Up @@ -22,10 +22,6 @@
#ifndef 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 <SyncPluginBase.h>
#include <ProfileManager.h>
Expand Down
4 changes: 2 additions & 2 deletions src/common/socialdbuteoplugin.cpp
Expand Up @@ -236,11 +236,11 @@ void SocialdButeoPlugin::syncStatusChanged()
emit success(getProfileName(), QString("%1 update succeeded").arg(getProfileName()));
} else if (syncStatus != SocialNetworkSyncAdaptor::Busy) {
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 {
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);
}
}

Expand Down

0 comments on commit 3c32e3d

Please sign in to comment.