mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Use Q_NULLPTR instead of nullptr as some of our older build machines don't support C++ 11.
This commit is contained in:
@@ -11,9 +11,9 @@
|
||||
|
||||
#include "pgAdmin4.h"
|
||||
#include "Logger.h"
|
||||
Logger* Logger::m_pThis = nullptr;
|
||||
Logger* Logger::m_pThis = Q_NULLPTR;
|
||||
QString Logger::m_sFileName = "";
|
||||
QFile* Logger::m_Logfile = nullptr;
|
||||
QFile* Logger::m_Logfile = Q_NULLPTR;
|
||||
|
||||
Logger::Logger()
|
||||
{
|
||||
@@ -24,7 +24,7 @@ Logger::~Logger()
|
||||
|
||||
Logger* Logger::GetLogger()
|
||||
{
|
||||
if (m_pThis == nullptr)
|
||||
if (m_pThis == Q_NULLPTR)
|
||||
{
|
||||
m_pThis = new Logger();
|
||||
m_sFileName = QDir::homePath() + (QString("/.%1.startup.log").arg(PGA_APP_NAME)).remove(" ");
|
||||
@@ -40,7 +40,7 @@ Logger* Logger::GetLogger()
|
||||
void Logger::Log(const QString& sMessage)
|
||||
{
|
||||
QString text = QDateTime::currentDateTime().toString("dd.MM.yyyy hh:mm:ss ") + sMessage + "\n";
|
||||
if (m_Logfile != nullptr)
|
||||
if (m_Logfile != Q_NULLPTR)
|
||||
{
|
||||
QTextStream out(m_Logfile);
|
||||
out << text;
|
||||
@@ -49,11 +49,11 @@ void Logger::Log(const QString& sMessage)
|
||||
|
||||
void Logger::ReleaseLogger()
|
||||
{
|
||||
if (m_pThis != nullptr)
|
||||
if (m_pThis != Q_NULLPTR)
|
||||
{
|
||||
if(m_Logfile != nullptr)
|
||||
if(m_Logfile != Q_NULLPTR)
|
||||
m_Logfile->close();
|
||||
delete m_pThis;
|
||||
m_pThis = nullptr;
|
||||
m_pThis = Q_NULLPTR;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user