Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'buteo_enum_type' into 'master'
Fix buteo enum type

See merge request mer-core/buteo-sync-plugins!10
  • Loading branch information
pvuorela committed Apr 12, 2021
2 parents 7c3855f + 83760eb commit 18359cc
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .gitignore
@@ -1,5 +1,8 @@
Makefile
*.so*
*.o
*.gcno
moc_*.cpp
*.list
*.prl
*.tag
Expand Down
5 changes: 3 additions & 2 deletions clientplugins/syncmlclient/SyncMLClient.cpp
Expand Up @@ -235,7 +235,7 @@ void SyncMLClient::syncFinished(DataSync::SyncState aState) {
case DataSync::UNSUPPORTED_STORAGE_TYPE:
{
generateResults( false );
emit error( getProfileName(), "", aState);
emit error(getProfileName(), "", Buteo::SyncResults::ABORTED);
break;
}
case DataSync::SUSPENDED:
Expand Down Expand Up @@ -598,7 +598,8 @@ void SyncMLClient::closeConfig() {

}

Buteo::SyncResults SyncMLClient::getSyncResults() const {
Buteo::SyncResults SyncMLClient::getSyncResults() const
{
FUNCTION_CALL_TRACE;

return iResults;
Expand Down
6 changes: 3 additions & 3 deletions serverplugins/syncmlserver/SyncMLServer.cpp
Expand Up @@ -460,7 +460,7 @@ SyncMLServer::handleSyncFinished (DataSync::SyncState state)
{
generateResults (true);
errorStatus = false;
emit success (getProfileName (), QString::number (state));
emit success(getProfileName(), QString::number(state));
break;
}

Expand All @@ -470,7 +470,7 @@ SyncMLServer::handleSyncFinished (DataSync::SyncState state)
case DataSync::INVALID_SYNCML_MESSAGE:
{
generateResults (false);
emit error (getProfileName (), QString::number (state), 0);
emit error(getProfileName(), QString::number(state), Buteo::SyncResults::INTERNAL_ERROR);
break;
}

Expand All @@ -479,7 +479,7 @@ SyncMLServer::handleSyncFinished (DataSync::SyncState state)
LOG_CRITICAL ("Unexpected state change");
generateResults (false);

emit error (getProfileName (), QString::number (state), 0);
emit error(getProfileName(), QString::number(state), Buteo::SyncResults::INTERNAL_ERROR);
break;
}
}
Expand Down

0 comments on commit 18359cc

Please sign in to comment.