Added the ErrorCode helper class to handle the current error code value.

Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Reviewed by Renato Araújo <renato.filho@openbossa.org>

1 files changed, 15 insertions, 4 deletions

diff --git a/generator/cppgenerator.h b/generator/cppgenerator.h
index 8f8509030..9ab2fbab5 100644
--- a/generator/cppgenerator.h
+++ b/generator/cppgenerator.h
@@ -61,8 +61,6 @@ private:
 
     /// Writes the check section for the validity of wrapped C++ objects.
     void writeInvalidPyObjectCheck(QTextStream& s, const QString& pyObj);
-    void writeInvalidPyObjectCheck(QTextStream& s, const QString& pyObj, int errorCode);
-    void writeInvalidPyObjectCheck(QTextStream& s, const QString& pyObj, QString returnValue);
 
     void writeTypeCheck(QTextStream& s, const AbstractMetaType* argType, QString argumentName, bool isNumber = false, QString customType = "");
     void writeTypeCheck(QTextStream& s, const OverloadData* overloadData, QString argumentName);
@@ -244,8 +242,21 @@ private:
     // Mapping protocol structure members names.
     static QHash<QString, QString> m_mpFuncs;
 
-    int m_currentErrorCode;
-
+    static int m_currentErrorCode;
+
+    /// Helper class to set and restore the current error code.
+    class ErrorCode {
+    public:
+        explicit ErrorCode(int errorCode) {
+            m_savedErrorCode = CppGenerator::m_currentErrorCode;
+            CppGenerator::m_currentErrorCode = errorCode;
+        }
+        ~ErrorCode() {
+            CppGenerator::m_currentErrorCode = m_savedErrorCode;
+        }
+    private:
+        int m_savedErrorCode;
+    };
 };
 
 #endif // CPPGENERATOR_H