[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kio] src/core: Replace COULD_NOT with CANNOT in the error code enum
From:       Alex Merry <alex.merry () kde ! org>
Date:       2014-03-31 22:29:05
Message-ID: E1WUkhV-0001py-R1 () scm ! kde ! org
[Download RAW message or body]

Git commit ed64faf67ccc86304e53305b9f93234988496605 by Alex Merry.
Committed on 30/03/2014 at 18:19.
Pushed by alexmerry into branch 'master'.

Replace COULD_NOT with CANNOT in the error code enum

This makes the error code names more consistent.  The old versions are
kept for backwards-compatibility.

REVIEW: 117195

M  +32   -16   src/core/global.h

http://commits.kde.org/kio/ed64faf67ccc86304e53305b9f93234988496605

diff --git a/src/core/global.h b/src/core/global.h
index be8e548..c554de1 100644
--- a/src/core/global.h
+++ b/src/core/global.h
@@ -169,22 +169,36 @@ enum Error {
     ERR_CYCLIC_LINK = KJob::UserDefinedError + 19,
     ERR_USER_CANCELED = KJob::KilledJobError,
     ERR_CYCLIC_COPY = KJob::UserDefinedError + 21,
-    ERR_COULD_NOT_CREATE_SOCKET = KJob::UserDefinedError + 22, // KDE4: \
                s/COULD_NOT/CANNOT/ or the other way round
-    ERR_COULD_NOT_CONNECT = KJob::UserDefinedError + 23,
+    ERR_COULD_NOT_CREATE_SOCKET = KJob::UserDefinedError + 22, //< @deprecated
+    ERR_CANNOT_CREATE_SOCKET = KJob::UserDefinedError + 22,
+    ERR_COULD_NOT_CONNECT = KJob::UserDefinedError + 23, //< @deprecated
+    ERR_CANNOT_CONNECT = KJob::UserDefinedError + 23,
     ERR_CONNECTION_BROKEN = KJob::UserDefinedError + 24,
     ERR_NOT_FILTER_PROTOCOL = KJob::UserDefinedError + 25,
-    ERR_COULD_NOT_MOUNT = KJob::UserDefinedError + 26,
-    ERR_COULD_NOT_UNMOUNT = KJob::UserDefinedError + 27,
-    ERR_COULD_NOT_READ = KJob::UserDefinedError + 28,
-    ERR_COULD_NOT_WRITE = KJob::UserDefinedError + 29,
-    ERR_COULD_NOT_BIND = KJob::UserDefinedError + 30,
-    ERR_COULD_NOT_LISTEN = KJob::UserDefinedError + 31,
-    ERR_COULD_NOT_ACCEPT = KJob::UserDefinedError + 32,
-    ERR_COULD_NOT_LOGIN = KJob::UserDefinedError + 33,
-    ERR_COULD_NOT_STAT = KJob::UserDefinedError + 34,
-    ERR_COULD_NOT_CLOSEDIR = KJob::UserDefinedError + 35,
-    ERR_COULD_NOT_MKDIR = KJob::UserDefinedError + 37,
-    ERR_COULD_NOT_RMDIR = KJob::UserDefinedError + 38,
+    ERR_COULD_NOT_MOUNT = KJob::UserDefinedError + 26, //< @deprecated
+    ERR_CANNOT_MOUNT = KJob::UserDefinedError + 26,
+    ERR_COULD_NOT_UNMOUNT = KJob::UserDefinedError + 27, //< @deprecated
+    ERR_CANNOT_UNMOUNT = KJob::UserDefinedError + 27,
+    ERR_COULD_NOT_READ = KJob::UserDefinedError + 28, //< @deprecated
+    ERR_CANNOT_READ = KJob::UserDefinedError + 28,
+    ERR_COULD_NOT_WRITE = KJob::UserDefinedError + 29, //< @deprecated
+    ERR_CANNOT_WRITE = KJob::UserDefinedError + 29,
+    ERR_COULD_NOT_BIND = KJob::UserDefinedError + 30, //< @deprecated
+    ERR_CANNOT_BIND = KJob::UserDefinedError + 30,
+    ERR_COULD_NOT_LISTEN = KJob::UserDefinedError + 31, //< @deprecated
+    ERR_CANNOT_LISTEN = KJob::UserDefinedError + 31,
+    ERR_COULD_NOT_ACCEPT = KJob::UserDefinedError + 32, //< @deprecated
+    ERR_CANNOT_ACCEPT = KJob::UserDefinedError + 32,
+    ERR_COULD_NOT_LOGIN = KJob::UserDefinedError + 33, //< @deprecated
+    ERR_CANNOT_LOGIN = KJob::UserDefinedError + 33,
+    ERR_COULD_NOT_STAT = KJob::UserDefinedError + 34, //< @deprecated
+    ERR_CANNOT_STAT = KJob::UserDefinedError + 34,
+    ERR_COULD_NOT_CLOSEDIR = KJob::UserDefinedError + 35, //< @deprecated
+    ERR_CANNOT_CLOSEDIR = KJob::UserDefinedError + 35,
+    ERR_COULD_NOT_MKDIR = KJob::UserDefinedError + 37, //< @deprecated
+    ERR_CANNOT_MKDIR = KJob::UserDefinedError + 37,
+    ERR_COULD_NOT_RMDIR = KJob::UserDefinedError + 38, //< @deprecated
+    ERR_CANNOT_RMDIR = KJob::UserDefinedError + 38,
     ERR_CANNOT_RESUME = KJob::UserDefinedError + 39,
     ERR_CANNOT_RENAME = KJob::UserDefinedError + 40,
     ERR_CANNOT_CHMOD = KJob::UserDefinedError + 41,
@@ -194,7 +208,8 @@ enum Error {
     ERR_SLAVE_DIED = KJob::UserDefinedError + 43,
     ERR_OUT_OF_MEMORY = KJob::UserDefinedError + 44,
     ERR_UNKNOWN_PROXY_HOST = KJob::UserDefinedError + 45,
-    ERR_COULD_NOT_AUTHENTICATE = KJob::UserDefinedError + 46,
+    ERR_COULD_NOT_AUTHENTICATE = KJob::UserDefinedError + 46, //< @deprecated
+    ERR_CANNOT_AUTHENTICATE = KJob::UserDefinedError + 46,
     ERR_ABORTED = KJob::UserDefinedError + 47, // Action got aborted from \
application side  ERR_INTERNAL_SERVER = KJob::UserDefinedError + 48,
     ERR_SERVER_TIMEOUT = KJob::UserDefinedError + 49,
@@ -221,8 +236,9 @@ enum Error {
     // object.  For instance, TLS is demanded by
     // the server in order to continue.
     ERR_POST_DENIED = KJob::UserDefinedError + 65, // Issued when trying to POST \
data to a certain Ports +    ERR_COULD_NOT_SEEK = KJob::UserDefinedError + 66, //< \
@deprecated  // see job.cpp
-    ERR_COULD_NOT_SEEK = KJob::UserDefinedError + 66,
+    ERR_CANNOT_SEEK = KJob::UserDefinedError + 66,
     ERR_CANNOT_SETTIME = KJob::UserDefinedError + 67, // Emitted by \
setModificationTime  ERR_CANNOT_CHOWN = KJob::UserDefinedError + 68,
     ERR_POST_NO_SIZE = KJob::UserDefinedError + 69


[prev in list] [next in list] [prev in thread] [next in thread]