From kde-commits  Fri Nov 04 23:33:44 2016
From: Andreas Hartmetz <ahartmetz () gmail ! com>
Date: Fri, 04 Nov 2016 23:33:44 +0000
To: kde-commits
Subject: [dferry] /: Error enum: rename one entry for clarity, remove an obsolete one.
Message-Id: <E1c2nzU-0004G9-U2 () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=147830243407129

Git commit 7d9b29b013a53d051f5ca0f6c57adf53a75e49f5 by Andreas Hartmetz.
Committed on 28/10/2016 at 16:45.
Pushed by ahartmetz into branch 'master'.

Error enum: rename one entry for clarity, remove an obsolete one.

M  +1    -1    serialization/arguments.cpp
M  +1    -2    util/error.h

http://commits.kde.org/dferry/7d9b29b013a53d051f5ca0f6c57adf53a75e49f5

diff --git a/serialization/arguments.cpp b/serialization/arguments.cpp
index 0a6e711..8bd2ffd 100644
--- a/serialization/arguments.cpp
+++ b/serialization/arguments.cpp
@@ -2081,7 +2081,7 @@ void Arguments::Writer::advanceState(cstring signatur=
eFragment, IoState newState
         }
         d->m_signature.length +=3D signatureFragment.length;
     } else {
-        VALID_IF(likely(!d->m_nilArrayNesting), Error::SubsequentIteration=
InNilArray);
+        VALID_IF(likely(!d->m_nilArrayNesting), Error::ExtraIterationInEmp=
tyArray);
         // signature must match first iteration (of an array/dict)
         VALID_IF(d->m_signaturePosition + signatureFragment.length <=3D d-=
>m_signature.length,
                  Error::TypeMismatchInSubsequentArrayIteration);
diff --git a/util/error.h b/util/error.h
index 8e78eda..38c283d 100644
--- a/util/error.h
+++ b/util/error.h
@@ -71,8 +71,7 @@ public:
         CannotEndArrayHere,
         CannotEndArrayOrDictHere,
         TooFewTypesInArrayOrDict,
-        CannotStartNextArrayOrDictEntryHere,
-        SubsequentIterationInNilArray,
+        ExtraIterationInEmptyArray,
         InvalidKeyTypeInDict,
         GreaterTwoTypesInDict,
         ArrayOrDictTooLong,