IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2026-09-03 20:52:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use Q_NULLPTR instead of nullptr as some of our older build machines don't support C++ 11.

Browse Source
This commit is contained in:
Dave Page
2018-12-06 10:40:49 +00:00
parent 5cfe0ef115
commit 72a2db53c3
10 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/Server.cpp
+9 -9
View File
@@ -61,8 +61,8 @@ Server::Server(quint16 port, QString key, QString logFileName)
m_port = port;
m_key = key;
m_logFileName = logFileName;
m_wcAppName = nullptr;
m_wcPythonHome = nullptr;
m_wcAppName = Q_NULLPTR;
m_wcPythonHome = Q_NULLPTR;
// Initialise Python
Py_NoSiteFlag=1;
@@ -201,7 +201,7 @@ Server::Server(quint16 port, QString key, QString logFileName)
// Get the current path
PyObject* sysPath = PySys_GetObject(const_cast<char *>("path"));
if (sysPath != nullptr)
if (sysPath != Q_NULLPTR)
{
// Add new additional path elements
Logger::GetLogger()->Log("Adding new additional path elements");
@@ -224,13 +224,13 @@ Server::Server(quint16 port, QString key, QString logFileName)
// Redirect stderr
Logger::GetLogger()->Log("Redirecting stderr...");
PyObject *sys = PyImport_ImportModule("sys");
if (sys != nullptr)
if (sys != Q_NULLPTR)
{
PyObject *err = nullptr;
PyObject *err = Q_NULLPTR;
#ifdef PYTHON2
err = PyFile_FromString(m_logFileName.toUtf8().data(), (char *)"w");
#else
FILE *log = nullptr;
FILE *log = Q_NULLPTR;
#if defined(Q_OS_WIN)
char *logFile = m_logFileName.toUtf8().data();
@@ -242,10 +242,10 @@ Server::Server(quint16 port, QString key, QString logFileName)
#else
log = fopen(m_logFileName.toUtf8().data(), const_cast<char *>("w"));
#endif
if (log != nullptr)
if (log != Q_NULLPTR)
{
int fd = fileno(log);
err = PyFile_FromFd(fd, nullptr, const_cast<char *>("w"), -1, nullptr, nullptr, nullptr, 0);
err = PyFile_FromFd(fd, Q_NULLPTR, const_cast<char *>("w"), -1, Q_NULLPTR, Q_NULLPTR, Q_NULLPTR, 0);
}
else
Logger::GetLogger()->Log(QString("Failed to open log file: %1").arg(m_logFileName));
@@ -259,7 +259,7 @@ Server::Server(quint16 port, QString key, QString logFileName)
#endif
#endif
QFile(m_logFileName).setPermissions(QFile::ReadOwner|QFile::WriteOwner);
if (err != nullptr)
if (err != Q_NULLPTR)
{
PyObject_SetAttrString(sys, "stderr", err);
Logger::GetLogger()->Log("stderr redirected successfully.");