From 868ab93a1fecd2a17d931728eb890de486a83418 Mon Sep 17 00:00:00 2001 From: Tannin Date: Fri, 28 Nov 2014 11:19:20 +0100 Subject: [PATCH] replaced all uses of NULL with nullptr fixed a few placed where NULL was used as a number or boolean --- src/proxy/proxypython.cpp | 26 +++++++++--------- src/runner/pythonrunner.cpp | 54 ++++++++++++++++++------------------- src/runner/uibasewrappers.h | 2 +- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/proxy/proxypython.cpp b/src/proxy/proxypython.cpp index 2592b7f..5f48c3c 100644 --- a/src/proxy/proxypython.cpp +++ b/src/proxy/proxypython.cpp @@ -37,7 +37,7 @@ const char *ProxyPython::s_DownloadPythonURL = "http://www.python.org/download/r HMODULE GetOwnModuleHandle() { - HMODULE hMod = NULL; + HMODULE hMod = nullptr; GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, reinterpret_cast(&GetOwnModuleHandle), &hMod); @@ -50,12 +50,12 @@ QString ExtractResource(WORD resourceID, const QString &szFilename) HMODULE mod = GetOwnModuleHandle(); HRSRC hResource = FindResourceW(mod, MAKEINTRESOURCE(resourceID), L"BINARY"); - if (hResource == NULL) { + if (hResource == nullptr) { throw MyException("embedded dll not available: " + windowsErrorString(::GetLastError())); } HGLOBAL hFileResource = LoadResource(mod, hResource); - if (hFileResource == NULL) { + if (hFileResource == nullptr) { throw MyException("failed to load embedded dll resource: " + windowsErrorString(::GetLastError())); } @@ -64,8 +64,8 @@ QString ExtractResource(WORD resourceID, const QString &szFilename) QString outFile = QDir::tempPath() + "/" + szFilename; - HANDLE hFile = CreateFileW(ToWString(outFile).c_str(), GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - HANDLE hFileMap = CreateFileMapping(hFile, NULL, PAGE_READWRITE, 0, dwSize, NULL); + HANDLE hFile = CreateFileW(ToWString(outFile).c_str(), GENERIC_READ | GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr); + HANDLE hFileMap = CreateFileMapping(hFile, nullptr, PAGE_READWRITE, 0, dwSize, nullptr); LPVOID lpAddress = MapViewOfFile(hFileMap, FILE_MAP_WRITE, 0, 0, 0); CopyMemory(lpAddress, lpFile, dwSize); @@ -81,7 +81,7 @@ QString ExtractResource(WORD resourceID, const QString &szFilename) ProxyPython::ProxyPython() - : m_MOInfo(NULL), m_Runner(NULL), m_LoadFailure(FAIL_NOTINIT) + : m_MOInfo(nullptr), m_Runner(nullptr), m_LoadFailure(FAIL_NOTINIT) { } @@ -119,9 +119,9 @@ bool ProxyPython::init(IOrganizer *moInfo) m_TempRunnerFile = ExtractResource(IDR_LOADER_DLL, "__pythonRunner.dll"); m_RunnerLib = ::LoadLibraryW(ToWString(m_TempRunnerFile).c_str()); - if (m_RunnerLib != NULL) { + if (m_RunnerLib != nullptr) { CreatePythonRunner_func CreatePythonRunner = (CreatePythonRunner_func)::GetProcAddress(m_RunnerLib, "CreatePythonRunner"); - if (CreatePythonRunner == NULL) { + if (CreatePythonRunner == nullptr) { throw MyException("embedded dll is invalid: " + windowsErrorString(::GetLastError())); } if (m_MOInfo->persistent(name(), "tryInit", false).toBool()) { @@ -146,7 +146,7 @@ bool ProxyPython::init(IOrganizer *moInfo) m_Runner = CreatePythonRunner(moInfo, pythonPath); m_MOInfo->setPersistent(name(), "tryInit", false); - if (m_Runner != NULL) { + if (m_Runner != nullptr) { m_LoadFailure = FAIL_NONE; } else { m_LoadFailure = FAIL_INITFAIL; @@ -210,11 +210,11 @@ QStringList ProxyPython::pluginList(const QString &pluginPath) const QObject *ProxyPython::instantiate(const QString &pluginName) { - if (m_Runner != NULL) { + if (m_Runner != nullptr) { QObject *result = m_Runner->instantiate(pluginName); return result; } else { - return NULL; + return nullptr; } } @@ -232,7 +232,7 @@ std::vector ProxyPython::activeProblems() const result.push_back(PROBLEM_INITFAIL); } else if (m_LoadFailure == FAIL_SEMICOLON) { result.push_back(PROBLEM_SEMICOLON); - } else if (m_Runner != NULL) { + } else if (m_Runner != nullptr) { if (!m_Runner->isPythonInstalled()) { // don't know how this could happen but wth result.push_back(PROBLEM_PYTHONMISSING); @@ -318,7 +318,7 @@ bool ProxyPython::hasGuidedFix(unsigned int key) const void ProxyPython::startGuidedFix(unsigned int key) const { if ((key == PROBLEM_PYTHONMISSING) || (key == PROBLEM_PYTHONWRONGVERSION)) { - ::ShellExecuteA(NULL, "open", s_DownloadPythonURL, NULL, NULL, SW_SHOWNORMAL); + ::ShellExecuteA(nullptr, "open", s_DownloadPythonURL, nullptr, nullptr, SW_SHOWNORMAL); } } diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp index 2a3da87..3d0ceaf 100644 --- a/src/runner/pythonrunner.cpp +++ b/src/runner/pythonrunner.cpp @@ -22,7 +22,7 @@ #endif -MOBase::IOrganizer *s_Organizer = NULL; +MOBase::IOrganizer *s_Organizer = nullptr; @@ -55,7 +55,7 @@ IPythonRunner *CreatePythonRunner(MOBase::IOrganizer *moInfo, const QString &pyt return result; } else { delete result; - return NULL; + return nullptr; } } @@ -103,13 +103,13 @@ struct QString_from_python_str } static void *convertible(PyObject *objPtr) { - return PyString_Check(objPtr) ? objPtr : NULL; + return PyString_Check(objPtr) ? objPtr : nullptr; } static void construct(PyObject *objPtr, bpy::converter::rvalue_from_python_stage1_data *data) { // Extract the character data from the python string const char* value = PyString_AsString(objPtr); - assert(value != NULL); + assert(value != nullptr); // allocate storage void *storage = ((bpy::converter::rvalue_from_python_storage*)data)->storage.bytes; @@ -146,7 +146,7 @@ struct GuessedValue_converters if PyList_Check(objPtr) { return objPtr; } else { - return NULL; + return nullptr; } } @@ -217,7 +217,7 @@ struct QVariant_from_python_obj static void *convertible(PyObject *objPtr) { if (!PyString_Check(objPtr) && !PyInt_Check(objPtr) && !PyBool_Check(objPtr) && !PyList_Check(objPtr)) { - return NULL; + return nullptr; } return objPtr; } @@ -310,7 +310,7 @@ struct QList_from_python_obj static void* convertible(PyObject *objPtr) { if (PyList_Check(objPtr)) return objPtr; - return NULL; + return nullptr; } static void construct(PyObject *objPtr, bpy::converter::rvalue_from_python_stage1_data *data) { @@ -339,7 +339,7 @@ struct stdset_from_python_list static void* convertible(PyObject *objPtr) { if (PyList_Check(objPtr)) return objPtr; - return NULL; + return nullptr; } static void construct(PyObject *objPtr, bpy::converter::rvalue_from_python_stage1_data *data) { @@ -359,8 +359,8 @@ struct stdset_from_python_list static const sipAPIDef *sipAPI() { - static const sipAPIDef *sipApi = NULL; - if (sipApi == NULL) { + static const sipAPIDef *sipApi = nullptr; + if (sipApi == nullptr) { sipApi = (const sipAPIDef *)PyCapsule_Import("sip._C_API", 0); } @@ -393,19 +393,19 @@ template <> struct MetaData { static const char *className() { return template PyObject *toPyQt(T *objPtr) { - if (objPtr == NULL) { + if (objPtr == nullptr) { qDebug("no input object"); return bpy::incref(Py_None); } const sipTypeDef *type = sipAPI()->api_find_type(MetaData::className()); - if (type == NULL) { + if (type == nullptr) { qDebug("failed to determine type: %s", MetaData::className()); return bpy::incref(Py_None); } PyObject *sipObj = sipAPI()->api_convert_from_type(objPtr, type, 0); - if (sipObj == NULL) { + if (sipObj == nullptr) { qDebug("failed to convert"); return bpy::incref(Py_None); } @@ -420,12 +420,12 @@ struct QClass_converters { static PyObject *convert(const T &object) { const sipTypeDef *type = sipAPI()->api_find_type(MetaData::className()); - if (type == NULL) { + if (type == nullptr) { return bpy::incref(Py_None); } PyObject *sipObj = sipAPI()->api_convert_from_type((void*)(&object), type, 0); - if (sipObj == NULL) { + if (sipObj == nullptr) { return bpy::incref(Py_None); } @@ -433,17 +433,17 @@ struct QClass_converters } static PyObject *convert(T *object) { - if (object == NULL) { + if (object == nullptr) { return bpy::incref(Py_None); } const sipTypeDef *type = sipAPI()->api_find_type(MetaData::className()); - if (type == NULL) { + if (type == nullptr) { return bpy::incref(Py_None); } PyObject *sipObj = sipAPI()->api_convert_from_type(object, type, 0); - if (sipObj == NULL) { + if (sipObj == nullptr) { return bpy::incref(Py_None); } @@ -484,12 +484,12 @@ struct QInterface_converters { static PyObject *convert(const T &object) { const sipTypeDef *type = sipAPI()->api_find_type(MetaData::className()); - if (type == NULL) { + if (type == nullptr) { return bpy::incref(Py_None); } PyObject *sipObj = sipAPI()->api_convert_from_type((void*)(&object), type, 0); - if (sipObj == NULL) { + if (sipObj == nullptr) { return bpy::incref(Py_None); } @@ -497,17 +497,17 @@ struct QInterface_converters } static PyObject *convert(T *object) { - if (object == NULL) { + if (object == nullptr) { return bpy::incref(Py_None); } const sipTypeDef *type = sipAPI()->api_find_type(MetaData::className()); - if (type == NULL) { + if (type == nullptr) { return bpy::incref(Py_None); } PyObject *sipObj = sipAPI()->api_convert_from_type(object, type, 0); - if (sipObj == NULL) { + if (sipObj == nullptr) { return bpy::incref(Py_None); } @@ -579,7 +579,7 @@ struct Functor0_converter { if (!PyCallable_Check(object) || (getArgCount(object) != 0)) { - return NULL; + return nullptr; } return object; } @@ -620,7 +620,7 @@ struct Functor2_converter { if (!PyCallable_Check(object) || (getArgCount(object) != 2)) { - return NULL; + return nullptr; } return object; } @@ -937,7 +937,7 @@ QObject *PythonRunner::instantiate(const QString &pluginName) std::string temp = ToString(pluginName); if (handled_exec_file(temp.c_str(), moduleNamespace)) { reportPythonError(); - return NULL; + return nullptr; } m_PythonObjects[pluginName] = moduleNamespace["createPlugin"](); @@ -948,7 +948,7 @@ QObject *PythonRunner::instantiate(const QString &pluginName) qWarning("failed to run python script \"%s\"", qPrintable(pluginName)); reportPythonError(); } - return NULL; + return nullptr; } bool PythonRunner::isPythonInstalled() const diff --git a/src/runner/uibasewrappers.h b/src/runner/uibasewrappers.h index ec29b84..faf4456 100644 --- a/src/runner/uibasewrappers.h +++ b/src/runner/uibasewrappers.h @@ -223,7 +223,7 @@ struct IOrganizerWrapper: MOBase::IOrganizer, boost::python::wrapperget_override("getFileOrigins")(fileName); } virtual QList findFileInfos(const QString &path, const std::function &filter) const { return this->get_override("findFileInfos")(path, filter); } virtual HANDLE startApplication(const QString &executable, const QStringList &args = QStringList(), const QString &cwd = "", const QString &profile = "") { return this->get_override("startApplication")(executable, args, cwd, profile); } - virtual bool waitForApplication(HANDLE handle, LPDWORD exitCode = NULL) const { return this->get_override("waitForApplication")(handle, exitCode); } + virtual bool waitForApplication(HANDLE handle, LPDWORD exitCode = nullptr) const { return this->get_override("waitForApplication")(handle, exitCode); } virtual void refreshModList(bool saveChanges = true) { this->get_override("refreshModList")(saveChanges); } virtual bool onAboutToRun(const std::function &func) { return this->get_override("onAboutToRun")(func); } virtual bool onFinishedRun(const std::function &func) { return this->get_override("onFinishedRun")(func); }