Base: rename Exception's PascalCase methods to camelCase
This commit is contained in:
@@ -70,7 +70,7 @@ const char* Exception::what() const noexcept
|
||||
return errorMessage.c_str();
|
||||
}
|
||||
|
||||
void Exception::ReportException() const
|
||||
void Exception::reportException() const
|
||||
{
|
||||
if (hasBeenReported) {
|
||||
return;
|
||||
@@ -247,7 +247,7 @@ const char* FileException::what() const noexcept
|
||||
return _sErrMsgAndFileName.c_str();
|
||||
}
|
||||
|
||||
void FileException::ReportException() const
|
||||
void FileException::reportException() const
|
||||
{
|
||||
if (getReported()) {
|
||||
return;
|
||||
|
||||
@@ -157,7 +157,7 @@ public:
|
||||
Exception& operator=(Exception&& inst) noexcept;
|
||||
|
||||
virtual const char* what() const noexcept;
|
||||
virtual void ReportException() const; // once only
|
||||
virtual void reportException() const; // once only
|
||||
|
||||
inline void setMessage(const std::string& message);
|
||||
// what may differ from the message given by the user in
|
||||
@@ -242,7 +242,7 @@ public:
|
||||
FileException(const std::string& message, const FileInfo& File);
|
||||
|
||||
const char* what() const noexcept override;
|
||||
void ReportException() const override;
|
||||
void reportException() const override;
|
||||
std::string getFileName() const;
|
||||
PyObject* getPyObject() override;
|
||||
|
||||
|
||||
@@ -89,10 +89,10 @@ PyException::PyException()
|
||||
|
||||
PyException::~PyException() noexcept = default;
|
||||
|
||||
void PyException::ThrowException()
|
||||
void PyException::throwException()
|
||||
{
|
||||
PyException myexcp;
|
||||
myexcp.ReportException();
|
||||
myexcp.reportException();
|
||||
myexcp.raiseException();
|
||||
}
|
||||
|
||||
@@ -123,7 +123,7 @@ void PyException::raiseException()
|
||||
throw *this;
|
||||
}
|
||||
|
||||
void PyException::ReportException() const
|
||||
void PyException::reportException() const
|
||||
{
|
||||
if (!getReported()) {
|
||||
setReported(true);
|
||||
@@ -252,7 +252,7 @@ std::string InterpreterSingleton::runString(const char* sCmd)
|
||||
throw SystemExitException();
|
||||
}
|
||||
|
||||
PyException::ThrowException();
|
||||
PyException::throwException();
|
||||
return {}; // just to quieten code analyzers
|
||||
}
|
||||
|
||||
@@ -296,7 +296,7 @@ std::string InterpreterSingleton::runStringWithKey(const char* psCmd,
|
||||
throw SystemExitException();
|
||||
}
|
||||
|
||||
PyException::ThrowException();
|
||||
PyException::throwException();
|
||||
return {}; // just to quieten code analyzers
|
||||
}
|
||||
Py_DECREF(presult);
|
||||
@@ -657,7 +657,7 @@ std::string InterpreterSingleton::init(int argc, char* argv[])
|
||||
return getPythonPath();
|
||||
}
|
||||
catch (const Exception& e) {
|
||||
e.ReportException();
|
||||
e.reportException();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -104,7 +104,7 @@ public:
|
||||
/// this method determines if the original exception
|
||||
/// can be reconstructed or not, if yes throws the reconstructed version
|
||||
/// if not, throws a generic PyException.
|
||||
static void ThrowException();
|
||||
static void throwException();
|
||||
|
||||
/// this function returns the stack trace
|
||||
const std::string& getStackTrace() const
|
||||
@@ -119,7 +119,7 @@ public:
|
||||
{
|
||||
return _exceptionType;
|
||||
}
|
||||
void ReportException() const override;
|
||||
void reportException() const override;
|
||||
/// Sets the Python error indicator and an error message
|
||||
void setPyException() const override;
|
||||
|
||||
|
||||
@@ -82,7 +82,7 @@ public:
|
||||
}
|
||||
catch (Py::Exception&) {
|
||||
Base::PyException e; // extract the Python error text
|
||||
e.ReportException();
|
||||
e.reportException();
|
||||
}
|
||||
}
|
||||
bool isEqual(const Py::Object& obj) const
|
||||
@@ -777,7 +777,7 @@ void ParameterGrpPy::tryCall(ParameterGrpObserver* obs,
|
||||
}
|
||||
catch (Py::Exception&) {
|
||||
Base::PyException e;
|
||||
e.ReportException();
|
||||
e.reportException();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user