summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-03-27 09:38:28 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-03-27 09:38:28 +0200
commitf99a8084b875815dc18ae67eeaed3919e8249463 (patch)
tree5522f4353089e9a0775725129c8a152152ba14fe
parent8c27163cff4090abc9664eca1895931bc0bd14d1 (diff)
downloadsink-f99a8084b875815dc18ae67eeaed3919e8249463.tar.gz
sink-f99a8084b875815dc18ae67eeaed3919e8249463.zip
Don't use 0 as error code and better error codes
-rw-r--r--common/domain/applicationdomaintype.h1
-rw-r--r--examples/imapresource/imapresource.cpp2
-rw-r--r--examples/imapresource/imapserverproxy.cpp4
-rw-r--r--examples/imapresource/imapserverproxy.h1
4 files changed, 5 insertions, 3 deletions
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index 6fd2b90..aa6a192 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -97,6 +97,7 @@ enum SINK_EXPORT ErrorCode {
97 NoError = 0, 97 NoError = 0,
98 UnknownError, 98 UnknownError,
99 NoServerError, 99 NoServerError,
100 ConnectionError,
100 LoginError, 101 LoginError,
101 TransmissionError, 102 TransmissionError,
102}; 103};
diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 5dce875..077795a 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -473,7 +473,7 @@ public:
473 { 473 {
474 if (error) { 474 if (error) {
475 if (error.errorCode == Imap::CouldNotConnectError) { 475 if (error.errorCode == Imap::CouldNotConnectError) {
476 return {ApplicationDomain::LoginError, error.errorMessage}; 476 return {ApplicationDomain::ConnectionError, error.errorMessage};
477 } else if (error.errorCode == Imap::SslHandshakeError) { 477 } else if (error.errorCode == Imap::SslHandshakeError) {
478 return {ApplicationDomain::LoginError, error.errorMessage}; 478 return {ApplicationDomain::LoginError, error.errorMessage};
479 } 479 }
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index a856576..0cc43b8 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -69,7 +69,7 @@ static KAsync::Job<T> runJob(KJob *job, const std::function<T(KJob*)> &f)
69 QObject::connect(job, &KJob::result, [&future, f](KJob *job) { 69 QObject::connect(job, &KJob::result, [&future, f](KJob *job) {
70 SinkTrace() << "Job done: " << job->metaObject()->className(); 70 SinkTrace() << "Job done: " << job->metaObject()->className();
71 if (job->error()) { 71 if (job->error()) {
72 SinkWarning() << "Job failed: " << job->errorString(); 72 SinkWarning() << "Job failed: " << job->errorString() << job->metaObject()->className();
73 future.setError(job->error(), job->errorString()); 73 future.setError(job->error(), job->errorString());
74 } else { 74 } else {
75 future.setValue(f(job)); 75 future.setValue(f(job));
@@ -87,7 +87,7 @@ static KAsync::Job<void> runJob(KJob *job)
87 QObject::connect(job, &KJob::result, [&future](KJob *job) { 87 QObject::connect(job, &KJob::result, [&future](KJob *job) {
88 SinkTrace() << "Job done: " << job->metaObject()->className(); 88 SinkTrace() << "Job done: " << job->metaObject()->className();
89 if (job->error()) { 89 if (job->error()) {
90 SinkWarning() << "Job failed: " << job->errorString(); 90 SinkWarning() << "Job failed: " << job->errorString() << job->metaObject()->className();
91 future.setError(job->error(), job->errorString()); 91 future.setError(job->error(), job->errorString());
92 } else { 92 } else {
93 future.setFinished(); 93 future.setFinished();
diff --git a/examples/imapresource/imapserverproxy.h b/examples/imapresource/imapserverproxy.h
index cae3105..872f032 100644
--- a/examples/imapresource/imapserverproxy.h
+++ b/examples/imapresource/imapserverproxy.h
@@ -30,6 +30,7 @@
30namespace Imap { 30namespace Imap {
31 31
32enum ErrorCode { 32enum ErrorCode {
33 NoError,
33 CouldNotConnectError, 34 CouldNotConnectError,
34 SslHandshakeError 35 SslHandshakeError
35}; 36};