Formats minimally release source files based on former clang-format
This commit is contained in:
387 files changed
+37323
-38074
No files matched your search
Executable → Regular
+2
-2
@@ -3,8 +3,8 @@
|
||||
#include "ngl_signal_handler.inc"
|
||||
|
||||
NGLApplication::NGLApplication(int &argc, char **argv)
|
||||
: QApplication(argc, argv)
|
||||
{
|
||||
: QApplication(argc, argv)
|
||||
{
|
||||
signal(SIGTERM, &signalHandler);
|
||||
#ifdef Q_OS_WIN
|
||||
installNativeEventFilter(new MyEventFilter);
|
||||
|
||||
Executable → Regular
+14
-12
@@ -6,23 +6,25 @@
|
||||
#include "nglloggerhandler.h"
|
||||
|
||||
#ifndef NGLAPPLICATION_EXPORT
|
||||
# ifdef BUILD_STATIC_LIBRARIES
|
||||
# define NGLAPPLICATION_EXPORT
|
||||
# else
|
||||
# ifdef MAKE_NGLAPPLICATION_LIB
|
||||
# define NGLAPPLICATION_EXPORT Q_DECL_EXPORT
|
||||
# else
|
||||
# define NGLAPPLICATION_EXPORT Q_DECL_IMPORT
|
||||
# endif
|
||||
# endif
|
||||
#ifdef BUILD_STATIC_LIBRARIES
|
||||
#define NGLAPPLICATION_EXPORT
|
||||
#else
|
||||
#ifdef MAKE_NGLAPPLICATION_LIB
|
||||
#define NGLAPPLICATION_EXPORT Q_DECL_EXPORT
|
||||
#else
|
||||
#define NGLAPPLICATION_EXPORT Q_DECL_IMPORT
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
class INGLLogger;
|
||||
class INGLLogger;
|
||||
}
|
||||
|
||||
class NGLAPPLICATION_EXPORT NGLApplication : public QApplication, public NGL::LoggerHandler
|
||||
class NGLAPPLICATION_EXPORT NGLApplication
|
||||
: public QApplication
|
||||
, public NGL::LoggerHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
@@ -33,4 +35,4 @@ protected:
|
||||
bool notify(QObject *o, QEvent *e) override;
|
||||
};
|
||||
|
||||
#define nglApp static_cast<NGLApplication*>(NGLApplication::instance())
|
||||
#define nglApp static_cast<NGLApplication *>(NGLApplication::instance())
|
||||
Executable → Regular
+2
-2
@@ -2,8 +2,8 @@
|
||||
#include "ngl_signal_handler.inc"
|
||||
|
||||
NGLCoreApplication::NGLCoreApplication(int &argc, char **argv)
|
||||
: QCoreApplication(argc, argv)
|
||||
{
|
||||
: QCoreApplication(argc, argv)
|
||||
{
|
||||
signal(SIGTERM, &signalHandler);
|
||||
#ifdef Q_OS_WIN
|
||||
installNativeEventFilter(new MyEventFilter);
|
||||
|
||||
Executable → Regular
+13
-11
@@ -4,23 +4,25 @@
|
||||
#include "nglloggerhandler.h"
|
||||
|
||||
#ifndef NGLCOREAPPLICATION_EXPORT
|
||||
# ifdef BUILD_STATIC_LIBRARIES
|
||||
# define NGLCOREAPPLICATION_EXPORT
|
||||
# else
|
||||
# ifdef MAKE_NGLCOREAPPLICATION_LIB
|
||||
# define NGLCOREAPPLICATION_EXPORT Q_DECL_EXPORT
|
||||
# else
|
||||
# define NGLCOREAPPLICATION_EXPORT Q_DECL_IMPORT
|
||||
# endif
|
||||
# endif
|
||||
#ifdef BUILD_STATIC_LIBRARIES
|
||||
#define NGLCOREAPPLICATION_EXPORT
|
||||
#else
|
||||
#ifdef MAKE_NGLCOREAPPLICATION_LIB
|
||||
#define NGLCOREAPPLICATION_EXPORT Q_DECL_EXPORT
|
||||
#else
|
||||
#define NGLCOREAPPLICATION_EXPORT Q_DECL_IMPORT
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
class INGLLogger;
|
||||
class INGLLogger;
|
||||
}
|
||||
|
||||
class NGLCOREAPPLICATION_EXPORT NGLCoreApplication : public QCoreApplication, public NGL::LoggerHandler
|
||||
class NGLCOREAPPLICATION_EXPORT NGLCoreApplication
|
||||
: public QCoreApplication
|
||||
, public NGL::LoggerHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
||||
Executable → Regular
+2
-2
@@ -2,8 +2,8 @@
|
||||
#include "ngl_signal_handler.inc"
|
||||
|
||||
NGLGuiApplication::NGLGuiApplication(int &argc, char **argv)
|
||||
: QGuiApplication(argc, argv)
|
||||
{
|
||||
: QGuiApplication(argc, argv)
|
||||
{
|
||||
signal(SIGTERM, &signalHandler);
|
||||
#ifdef Q_OS_WIN
|
||||
installNativeEventFilter(new MyEventFilter);
|
||||
|
||||
Executable → Regular
+14
-12
@@ -4,23 +4,25 @@
|
||||
#include "nglloggerhandler.h"
|
||||
|
||||
#ifndef NGLGUIAPPLICATION_EXPORT
|
||||
# ifdef BUILD_STATIC_LIBRARIES
|
||||
# define NGLGUIAPPLICATION_EXPORT
|
||||
# else
|
||||
# ifdef MAKE_NGLGUIAPPLICATION_LIB
|
||||
# define NGLGUIAPPLICATION_EXPORT Q_DECL_EXPORT
|
||||
# else
|
||||
# define NGLGUIAPPLICATION_EXPORT Q_DECL_IMPORT
|
||||
# endif
|
||||
# endif
|
||||
#ifdef BUILD_STATIC_LIBRARIES
|
||||
#define NGLGUIAPPLICATION_EXPORT
|
||||
#else
|
||||
#ifdef MAKE_NGLGUIAPPLICATION_LIB
|
||||
#define NGLGUIAPPLICATION_EXPORT Q_DECL_EXPORT
|
||||
#else
|
||||
#define NGLGUIAPPLICATION_EXPORT Q_DECL_IMPORT
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
class INGLLogger;
|
||||
class INGLLogger;
|
||||
}
|
||||
|
||||
class NGLGUIAPPLICATION_EXPORT NGLGuiApplication : public QGuiApplication, public NGL::LoggerHandler
|
||||
class NGLGUIAPPLICATION_EXPORT NGLGuiApplication
|
||||
: public QGuiApplication
|
||||
, public NGL::LoggerHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
@@ -28,4 +30,4 @@ public:
|
||||
NGLGuiApplication(int &argc, char **argv);
|
||||
};
|
||||
|
||||
#define nglGuiApp static_cast<NGLGuiApplication*>(NGLGuiApplication::instance())
|
||||
#define nglGuiApp static_cast<NGLGuiApplication *>(NGLGuiApplication::instance())
|
||||
Executable → Regular
+65
-65
@@ -7,72 +7,72 @@
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
static QByteArray username()
|
||||
{
|
||||
static QByteArray username()
|
||||
{
|
||||
#ifdef Q_OS_WIN
|
||||
return qgetenv("USERNAME");
|
||||
return qgetenv("USERNAME");
|
||||
#else
|
||||
return qgetenv("USER");
|
||||
return qgetenv("USER");
|
||||
#endif
|
||||
}
|
||||
|
||||
static void setEnvVars()
|
||||
{
|
||||
const QString logPath = NGL::Settings::logPath();
|
||||
qputenv("LOG4QT_LOGDIR", logPath.toLocal8Bit());
|
||||
qputenv("LOG4QT_USER", username());
|
||||
}
|
||||
|
||||
void LoggerHandler::createLogger(const QByteArray &baseName, const char *configFileName, bool quiet)
|
||||
{
|
||||
setEnvVars();
|
||||
m_baseLoggerName = baseName;
|
||||
|
||||
const QString bnStr(QString::fromLatin1(baseName.toLower()));
|
||||
const QString logPath = NGL::Settings::logPath();
|
||||
m_loggerFilenamePostfix = logPath + QLatin1Char('/') + QString::fromLocal8Bit(username()) + QLatin1Char('_') + bnStr;
|
||||
m_loggerFilenamePrefix = QLatin1String(".log");
|
||||
|
||||
const QString logOutputName = m_loggerFilenamePostfix + m_loggerFilenamePrefix;
|
||||
NGL::NGLLoggerBootstrap::createNGLRootLogger(QString::fromLatin1(configFileName), false, logOutputName, quiet);
|
||||
|
||||
qInstallMessageHandler(&qtMsgHandler);
|
||||
}
|
||||
|
||||
void LoggerHandler::createLogger(const QByteArray &baseName, int exerciseId, int additionalId, bool quiet)
|
||||
{
|
||||
setEnvVars();
|
||||
|
||||
const QString bnStr(QString::fromLatin1(baseName.toLower()));
|
||||
const QString configFileName = QLatin1String("log4cxx_") + bnStr + QLatin1String(".props");
|
||||
const QString logPath = NGL::Settings::logPath();
|
||||
m_loggerFilenamePostfix = logPath + QLatin1Char('/') + QString::fromLocal8Bit(username()) + QLatin1Char('_') + bnStr;
|
||||
if (exerciseId > 0)
|
||||
m_loggerFilenamePostfix += QLatin1Char('_') + QString::number(exerciseId);
|
||||
if (additionalId > 0)
|
||||
m_loggerFilenamePostfix += QLatin1Char('_') + QString::number(additionalId);
|
||||
|
||||
m_loggerFilenamePrefix = QLatin1String(".log");
|
||||
m_baseLoggerName = baseName + QByteArray(".main");
|
||||
|
||||
const QString logOutputName = m_loggerFilenamePostfix + m_loggerFilenamePrefix;
|
||||
NGL::NGLLoggerBootstrap::createNGLRootLogger(configFileName, false, logOutputName, quiet);
|
||||
qInstallMessageHandler(&qtMsgHandler);
|
||||
}
|
||||
|
||||
NGL::INGLLogger &LoggerHandler::baseLogger() const
|
||||
{
|
||||
return NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger(m_baseLoggerName.data());
|
||||
}
|
||||
|
||||
NGL::INGLLogger &LoggerHandler::logger(const char *loggerName) const
|
||||
{
|
||||
return NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger(loggerName);
|
||||
}
|
||||
|
||||
LoggerHandler *LoggerHandler::getLoggerHandler()
|
||||
{
|
||||
return dynamic_cast<LoggerHandler *>(QCoreApplication::instance());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
static void setEnvVars()
|
||||
{
|
||||
const QString logPath = NGL::Settings::logPath();
|
||||
qputenv("LOG4QT_LOGDIR", logPath.toLocal8Bit());
|
||||
qputenv("LOG4QT_USER", username());
|
||||
}
|
||||
|
||||
void LoggerHandler::createLogger(const QByteArray &baseName, const char *configFileName, bool quiet)
|
||||
{
|
||||
setEnvVars();
|
||||
m_baseLoggerName = baseName;
|
||||
|
||||
const QString bnStr(QString::fromLatin1(baseName.toLower()));
|
||||
const QString logPath = NGL::Settings::logPath();
|
||||
m_loggerFilenamePostfix = logPath + QLatin1Char('/') + QString::fromLocal8Bit(username()) + QLatin1Char('_') + bnStr;
|
||||
m_loggerFilenamePrefix = QLatin1String(".log");
|
||||
|
||||
const QString logOutputName = m_loggerFilenamePostfix + m_loggerFilenamePrefix;
|
||||
NGL::NGLLoggerBootstrap::createNGLRootLogger(QString::fromLatin1(configFileName), false, logOutputName, quiet);
|
||||
|
||||
qInstallMessageHandler(&qtMsgHandler);
|
||||
}
|
||||
|
||||
void LoggerHandler::createLogger(const QByteArray &baseName, int exerciseId, int additionalId, bool quiet)
|
||||
{
|
||||
setEnvVars();
|
||||
|
||||
const QString bnStr(QString::fromLatin1(baseName.toLower()));
|
||||
const QString configFileName = QLatin1String("log4cxx_") + bnStr + QLatin1String(".props");
|
||||
const QString logPath = NGL::Settings::logPath();
|
||||
m_loggerFilenamePostfix = logPath + QLatin1Char('/') + QString::fromLocal8Bit(username()) + QLatin1Char('_') + bnStr;
|
||||
if (exerciseId > 0)
|
||||
m_loggerFilenamePostfix += QLatin1Char('_') + QString::number(exerciseId);
|
||||
if (additionalId > 0)
|
||||
m_loggerFilenamePostfix += QLatin1Char('_') + QString::number(additionalId);
|
||||
|
||||
m_loggerFilenamePrefix = QLatin1String(".log");
|
||||
m_baseLoggerName = baseName + QByteArray(".main");
|
||||
|
||||
const QString logOutputName = m_loggerFilenamePostfix + m_loggerFilenamePrefix;
|
||||
NGL::NGLLoggerBootstrap::createNGLRootLogger(configFileName, false, logOutputName, quiet);
|
||||
qInstallMessageHandler(&qtMsgHandler);
|
||||
}
|
||||
|
||||
NGL::INGLLogger &LoggerHandler::baseLogger() const
|
||||
{
|
||||
return NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger(m_baseLoggerName.data());
|
||||
}
|
||||
|
||||
NGL::INGLLogger &LoggerHandler::logger(const char *loggerName) const
|
||||
{
|
||||
return NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger(loggerName);
|
||||
}
|
||||
|
||||
LoggerHandler *LoggerHandler::getLoggerHandler()
|
||||
{
|
||||
return dynamic_cast<LoggerHandler*>(QCoreApplication::instance());
|
||||
}
|
||||
|
||||
}
|
||||
Executable → Regular
+30
-40
@@ -6,62 +6,52 @@
|
||||
#include <QtCore/QString>
|
||||
|
||||
#ifndef LOGGERHANDLER_EXPORT
|
||||
# ifdef BUILD_STATIC_LIBRARIES
|
||||
# define LOGGERHANDLER_EXPORT
|
||||
# else
|
||||
# if defined(MAKE_NGLCOREAPPLICATION_LIB) || defined(MAKE_NGLGUIAPPLICATION_LIB) || defined(MAKE_NGLAPPLICATION_LIB) || defined(MAKE_NGLSINGLECOREAPPLICATION_LIB) || defined(MAKE_NGLSINGLEAPPLICATION_LIB)
|
||||
# define LOGGERHANDLER_EXPORT Q_DECL_EXPORT
|
||||
# else
|
||||
# define LOGGERHANDLER_EXPORT Q_DECL_IMPORT
|
||||
# endif
|
||||
# endif
|
||||
#ifdef BUILD_STATIC_LIBRARIES
|
||||
#define LOGGERHANDLER_EXPORT
|
||||
#else
|
||||
#if defined(MAKE_NGLCOREAPPLICATION_LIB) || defined(MAKE_NGLGUIAPPLICATION_LIB) || defined(MAKE_NGLAPPLICATION_LIB) || defined(MAKE_NGLSINGLECOREAPPLICATION_LIB) || \
|
||||
defined(MAKE_NGLSINGLEAPPLICATION_LIB)
|
||||
#define LOGGERHANDLER_EXPORT Q_DECL_EXPORT
|
||||
#else
|
||||
#define LOGGERHANDLER_EXPORT Q_DECL_IMPORT
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
class INGLLogger;
|
||||
class INGLLogger;
|
||||
|
||||
class LOGGERHANDLER_EXPORT LoggerHandler
|
||||
{
|
||||
public:
|
||||
LoggerHandler() = default;
|
||||
~LoggerHandler() = default;
|
||||
class LOGGERHANDLER_EXPORT LoggerHandler
|
||||
{
|
||||
public:
|
||||
LoggerHandler() = default;
|
||||
~LoggerHandler() = default;
|
||||
|
||||
|
||||
|
||||
void createLogger(const QByteArray &baseName,
|
||||
const char *configFileName,
|
||||
bool quiet = false);
|
||||
void createLogger(const QByteArray &baseName, const char *configFileName, bool quiet = false);
|
||||
|
||||
|
||||
|
||||
void createLogger(const QByteArray &baseName,
|
||||
int exerciseId = 0,
|
||||
int additionalId = 0,
|
||||
bool quiet = false);
|
||||
void createLogger(const QByteArray &baseName, int exerciseId = 0, int additionalId = 0, bool quiet = false);
|
||||
|
||||
|
||||
|
||||
NGL::INGLLogger &baseLogger() const;
|
||||
NGL::INGLLogger &baseLogger() const;
|
||||
|
||||
|
||||
|
||||
NGL::INGLLogger &logger(const char *loggerName) const;
|
||||
NGL::INGLLogger &logger(const char *loggerName) const;
|
||||
|
||||
|
||||
|
||||
QString loggerNamePostfix() const { return m_loggerFilenamePostfix; }
|
||||
QString loggerNamePostfix() const { return m_loggerFilenamePostfix; }
|
||||
|
||||
|
||||
|
||||
QString loggerNamePrefix() const { return m_loggerFilenamePrefix; }
|
||||
QString loggerNamePrefix() const { return m_loggerFilenamePrefix; }
|
||||
|
||||
|
||||
|
||||
static LoggerHandler *getLoggerHandler();
|
||||
private:
|
||||
QByteArray m_baseLoggerName;
|
||||
QString m_loggerFilenamePostfix;
|
||||
QString m_loggerFilenamePrefix;
|
||||
};
|
||||
}
|
||||
static LoggerHandler *getLoggerHandler();
|
||||
|
||||
private:
|
||||
QByteArray m_baseLoggerName;
|
||||
QString m_loggerFilenamePostfix;
|
||||
QString m_loggerFilenamePrefix;
|
||||
};
|
||||
}
|
||||
Executable → Regular
+2
-2
@@ -7,9 +7,9 @@
|
||||
|
||||
|
||||
NGLSingleApplication::NGLSingleApplication(int &argc, char **argv)
|
||||
: QtSingleApplication(argc, argv)
|
||||
: QtSingleApplication(argc, argv)
|
||||
{
|
||||
|
||||
|
||||
signal(SIGTERM, &signalHandler);
|
||||
#ifdef Q_OS_WIN
|
||||
installNativeEventFilter(new MyEventFilter);
|
||||
|
||||
Executable → Regular
+14
-12
@@ -5,23 +5,25 @@
|
||||
#include "nglloggerhandler.h"
|
||||
|
||||
#ifndef NGLSINGLEAPPLICATION_EXPORT
|
||||
# ifdef BUILD_STATIC_LIBRARIES
|
||||
# define NGLSINGLEAPPLICATION_EXPORT
|
||||
# else
|
||||
# ifdef MAKE_NGLSINGLEAPPLICATION_LIB
|
||||
# define NGLSINGLEAPPLICATION_EXPORT Q_DECL_EXPORT
|
||||
# else
|
||||
# define NGLSINGLEAPPLICATION_EXPORT Q_DECL_IMPORT
|
||||
# endif
|
||||
# endif
|
||||
#ifdef BUILD_STATIC_LIBRARIES
|
||||
#define NGLSINGLEAPPLICATION_EXPORT
|
||||
#else
|
||||
#ifdef MAKE_NGLSINGLEAPPLICATION_LIB
|
||||
#define NGLSINGLEAPPLICATION_EXPORT Q_DECL_EXPORT
|
||||
#else
|
||||
#define NGLSINGLEAPPLICATION_EXPORT Q_DECL_IMPORT
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
class INGLLogger;
|
||||
class INGLLogger;
|
||||
}
|
||||
|
||||
class NGLSINGLEAPPLICATION_EXPORT NGLSingleApplication : public QtSingleApplication, public NGL::LoggerHandler
|
||||
class NGLSINGLEAPPLICATION_EXPORT NGLSingleApplication
|
||||
: public QtSingleApplication
|
||||
, public NGL::LoggerHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
@@ -32,4 +34,4 @@ protected:
|
||||
bool notify(QObject *o, QEvent *e) override;
|
||||
};
|
||||
|
||||
#define nglApp static_cast<NGLSingleApplication*>(NGLSingleApplication::instance())
|
||||
#define nglApp static_cast<NGLSingleApplication *>(NGLSingleApplication::instance())
|
||||
Executable → Regular
+2
-2
@@ -2,8 +2,8 @@
|
||||
#include "ngl_signal_handler.inc"
|
||||
|
||||
NGLSingleCoreApplication::NGLSingleCoreApplication(int &argc, char **argv)
|
||||
: QtSingleCoreApplication(argc, argv)
|
||||
{
|
||||
: QtSingleCoreApplication(argc, argv)
|
||||
{
|
||||
signal(SIGTERM, &signalHandler);
|
||||
#ifdef Q_OS_WIN
|
||||
installNativeEventFilter(new MyEventFilter);
|
||||
|
||||
Executable → Regular
+13
-11
@@ -4,23 +4,25 @@
|
||||
#include "nglloggerhandler.h"
|
||||
|
||||
#ifndef NGLSINGLECOREAPPLICATION_EXPORT
|
||||
# ifdef BUILD_STATIC_LIBRARIES
|
||||
# define NGLSINGLECOREAPPLICATION_EXPORT
|
||||
# else
|
||||
# ifdef MAKE_NGLSINGLECOREAPPLICATION_LIB
|
||||
# define NGLSINGLECOREAPPLICATION_EXPORT Q_DECL_EXPORT
|
||||
# else
|
||||
# define NGLSINGLECOREAPPLICATION_EXPORT Q_DECL_IMPORT
|
||||
# endif
|
||||
# endif
|
||||
#ifdef BUILD_STATIC_LIBRARIES
|
||||
#define NGLSINGLECOREAPPLICATION_EXPORT
|
||||
#else
|
||||
#ifdef MAKE_NGLSINGLECOREAPPLICATION_LIB
|
||||
#define NGLSINGLECOREAPPLICATION_EXPORT Q_DECL_EXPORT
|
||||
#else
|
||||
#define NGLSINGLECOREAPPLICATION_EXPORT Q_DECL_IMPORT
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
class INGLLogger;
|
||||
class INGLLogger;
|
||||
}
|
||||
|
||||
class NGLSINGLECOREAPPLICATION_EXPORT NGLSingleCoreApplication : public QtSingleCoreApplication, public NGL::LoggerHandler
|
||||
class NGLSINGLECOREAPPLICATION_EXPORT NGLSingleCoreApplication
|
||||
: public QtSingleCoreApplication
|
||||
, public NGL::LoggerHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
||||
Reference in new issue
Block a user