From kde-commits  Mon Mar 31 22:29:05 2014
From: Alex Merry <alex.merry () kde ! org>
Date: Mon, 31 Mar 2014 22:29:05 +0000
To: kde-commits
Subject: [kio] src/core: Replace COULD_NOT with CANNOT in the error code enum
Message-Id: <E1WUkhV-0001py-R1 () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=139630495618092

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 =3D KJob::UserDefinedError + 19,
     ERR_USER_CANCELED =3D KJob::KilledJobError,
     ERR_CYCLIC_COPY =3D KJob::UserDefinedError + 21,
-    ERR_COULD_NOT_CREATE_SOCKET =3D KJob::UserDefinedError + 22, // KDE4: =
s/COULD_NOT/CANNOT/ or the other way round
-    ERR_COULD_NOT_CONNECT =3D KJob::UserDefinedError + 23,
+    ERR_COULD_NOT_CREATE_SOCKET =3D KJob::UserDefinedError + 22, //< @depr=
ecated
+    ERR_CANNOT_CREATE_SOCKET =3D KJob::UserDefinedError + 22,
+    ERR_COULD_NOT_CONNECT =3D KJob::UserDefinedError + 23, //< @deprecated
+    ERR_CANNOT_CONNECT =3D KJob::UserDefinedError + 23,
     ERR_CONNECTION_BROKEN =3D KJob::UserDefinedError + 24,
     ERR_NOT_FILTER_PROTOCOL =3D KJob::UserDefinedError + 25,
-    ERR_COULD_NOT_MOUNT =3D KJob::UserDefinedError + 26,
-    ERR_COULD_NOT_UNMOUNT =3D KJob::UserDefinedError + 27,
-    ERR_COULD_NOT_READ =3D KJob::UserDefinedError + 28,
-    ERR_COULD_NOT_WRITE =3D KJob::UserDefinedError + 29,
-    ERR_COULD_NOT_BIND =3D KJob::UserDefinedError + 30,
-    ERR_COULD_NOT_LISTEN =3D KJob::UserDefinedError + 31,
-    ERR_COULD_NOT_ACCEPT =3D KJob::UserDefinedError + 32,
-    ERR_COULD_NOT_LOGIN =3D KJob::UserDefinedError + 33,
-    ERR_COULD_NOT_STAT =3D KJob::UserDefinedError + 34,
-    ERR_COULD_NOT_CLOSEDIR =3D KJob::UserDefinedError + 35,
-    ERR_COULD_NOT_MKDIR =3D KJob::UserDefinedError + 37,
-    ERR_COULD_NOT_RMDIR =3D KJob::UserDefinedError + 38,
+    ERR_COULD_NOT_MOUNT =3D KJob::UserDefinedError + 26, //< @deprecated
+    ERR_CANNOT_MOUNT =3D KJob::UserDefinedError + 26,
+    ERR_COULD_NOT_UNMOUNT =3D KJob::UserDefinedError + 27, //< @deprecated
+    ERR_CANNOT_UNMOUNT =3D KJob::UserDefinedError + 27,
+    ERR_COULD_NOT_READ =3D KJob::UserDefinedError + 28, //< @deprecated
+    ERR_CANNOT_READ =3D KJob::UserDefinedError + 28,
+    ERR_COULD_NOT_WRITE =3D KJob::UserDefinedError + 29, //< @deprecated
+    ERR_CANNOT_WRITE =3D KJob::UserDefinedError + 29,
+    ERR_COULD_NOT_BIND =3D KJob::UserDefinedError + 30, //< @deprecated
+    ERR_CANNOT_BIND =3D KJob::UserDefinedError + 30,
+    ERR_COULD_NOT_LISTEN =3D KJob::UserDefinedError + 31, //< @deprecated
+    ERR_CANNOT_LISTEN =3D KJob::UserDefinedError + 31,
+    ERR_COULD_NOT_ACCEPT =3D KJob::UserDefinedError + 32, //< @deprecated
+    ERR_CANNOT_ACCEPT =3D KJob::UserDefinedError + 32,
+    ERR_COULD_NOT_LOGIN =3D KJob::UserDefinedError + 33, //< @deprecated
+    ERR_CANNOT_LOGIN =3D KJob::UserDefinedError + 33,
+    ERR_COULD_NOT_STAT =3D KJob::UserDefinedError + 34, //< @deprecated
+    ERR_CANNOT_STAT =3D KJob::UserDefinedError + 34,
+    ERR_COULD_NOT_CLOSEDIR =3D KJob::UserDefinedError + 35, //< @deprecated
+    ERR_CANNOT_CLOSEDIR =3D KJob::UserDefinedError + 35,
+    ERR_COULD_NOT_MKDIR =3D KJob::UserDefinedError + 37, //< @deprecated
+    ERR_CANNOT_MKDIR =3D KJob::UserDefinedError + 37,
+    ERR_COULD_NOT_RMDIR =3D KJob::UserDefinedError + 38, //< @deprecated
+    ERR_CANNOT_RMDIR =3D KJob::UserDefinedError + 38,
     ERR_CANNOT_RESUME =3D KJob::UserDefinedError + 39,
     ERR_CANNOT_RENAME =3D KJob::UserDefinedError + 40,
     ERR_CANNOT_CHMOD =3D KJob::UserDefinedError + 41,
@@ -194,7 +208,8 @@ enum Error {
     ERR_SLAVE_DIED =3D KJob::UserDefinedError + 43,
     ERR_OUT_OF_MEMORY =3D KJob::UserDefinedError + 44,
     ERR_UNKNOWN_PROXY_HOST =3D KJob::UserDefinedError + 45,
-    ERR_COULD_NOT_AUTHENTICATE =3D KJob::UserDefinedError + 46,
+    ERR_COULD_NOT_AUTHENTICATE =3D KJob::UserDefinedError + 46, //< @depre=
cated
+    ERR_CANNOT_AUTHENTICATE =3D KJob::UserDefinedError + 46,
     ERR_ABORTED =3D KJob::UserDefinedError + 47, // Action got aborted fro=
m application side
     ERR_INTERNAL_SERVER =3D KJob::UserDefinedError + 48,
     ERR_SERVER_TIMEOUT =3D 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 =3D KJob::UserDefinedError + 65, // Issued when trying=
 to POST data to a certain Ports
+    ERR_COULD_NOT_SEEK =3D KJob::UserDefinedError + 66, //< @deprecated
     // see job.cpp
-    ERR_COULD_NOT_SEEK =3D KJob::UserDefinedError + 66,
+    ERR_CANNOT_SEEK =3D KJob::UserDefinedError + 66,
     ERR_CANNOT_SETTIME =3D KJob::UserDefinedError + 67, // Emitted by setM=
odificationTime
     ERR_CANNOT_CHOWN =3D KJob::UserDefinedError + 68,
     ERR_POST_NO_SIZE =3D KJob::UserDefinedError + 69