diff --git a/MantidPlot/src/Process.cpp b/MantidPlot/src/Process.cpp index d43bec1bbad4660163dfec9e3a1a4503d5f471f8..a7b160fb6175f133963a60881edc123bf4f701f6 100644 --- a/MantidPlot/src/Process.cpp +++ b/MantidPlot/src/Process.cpp @@ -12,20 +12,18 @@ namespace { class PyObjectNewReference { public: - PyObjectNewReference(PyObject *object) : m_object(object) {} + explicit PyObjectNewReference(PyObject *object) : m_object(object) {} ~PyObjectNewReference() { Py_XDECREF(m_object); } PyObjectNewReference(const PyObjectNewReference &) = delete; PyObjectNewReference &operator=(const PyObjectNewReference &) = delete; - PyObjectNewReference(PyObjectNewReference &&o) { - *this = std::move(o); - } + PyObjectNewReference(PyObjectNewReference &&o) { *this = std::move(o); } PyObjectNewReference &operator=(PyObjectNewReference &&other) { - this->m_object = other.m_object; - other.m_object = nullptr; - return *this; + this->m_object = other.m_object; + other.m_object = nullptr; + return *this; } inline PyObject *ptr() const { return m_object; } @@ -46,7 +44,7 @@ PyObjectNewReference attr(PyObject *source, const char *name) { if (attr.ptr()) { return attr; } else { - PyErr_Print(); + PyErr_Print(); throw std::runtime_error(std::string("Process: No attribute ") + name + " found"); } @@ -65,7 +63,7 @@ PyObjectNewReference call(PyObject *source, const char *name) { if (result) return PyObjectNewReference(result); else { - PyErr_Print(); + PyErr_Print(); throw std::runtime_error(std::string("Process: Error calling function ") + name); } @@ -92,9 +90,7 @@ namespace Process { * @return True if another instance is running * @throws std::runtime_error if the PID list cannot be determined */ -bool isAnotherInstanceRunning() { - return !otherInstancePIDs().empty(); -} +bool isAnotherInstanceRunning() { return !otherInstancePIDs().empty(); } /** * @brief Return a list of process IDs for other instances of this process. diff --git a/MantidPlot/src/ProjectRecovery.cpp b/MantidPlot/src/ProjectRecovery.cpp index 77ebb1f2e0bb7b53ed64f8d748eeb109fa5a3215..8f32c83df68c08e00ec4e4d5b979bdfa7ba26346 100644 --- a/MantidPlot/src/ProjectRecovery.cpp +++ b/MantidPlot/src/ProjectRecovery.cpp @@ -64,7 +64,8 @@ boost::optional<bool> getConfigBool(const std::string &key) { /// Returns a string to the current top level recovery folder std::string getRecoveryFolder() { - static std::string appData = Mantid::Kernel::ConfigService::Instance().getAppDataDir(); + static std::string appData = + Mantid::Kernel::ConfigService::Instance().getAppDataDir(); static std::string hostname = Poco::Environment::nodeName(); static std::string recoverFolder = appData + "/recovery/" + hostname + '/';