mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-10 16:24:45 -07:00
Clang-format (#3028)
* 1/3 Add .clang-format file and travis compilation check * 2/3 Run clang-format * 3/3 Fix compilation problems due to include reordering * 3bis/3 AfterControlStatement: false
This commit is contained in:
parent
8dbdd24c8e
commit
b29bd9e070
272 changed files with 13378 additions and 9535 deletions
|
|
@ -7,7 +7,7 @@
|
|||
#define LOGGER_FILENAME "qdebug.txt"
|
||||
|
||||
#if QT_VERSION >= 0x050400
|
||||
#include <QSysInfo>
|
||||
#include <QSysInfo>
|
||||
#endif
|
||||
|
||||
Logger::Logger() : logToFileEnabled(false)
|
||||
|
|
@ -26,12 +26,9 @@ Logger::~Logger()
|
|||
|
||||
void Logger::logToFile(bool enabled)
|
||||
{
|
||||
if (enabled)
|
||||
{
|
||||
if (enabled) {
|
||||
openLogfileSession();
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
closeLogfileSession();
|
||||
}
|
||||
}
|
||||
|
|
@ -43,8 +40,7 @@ QString Logger::getClientVersion()
|
|||
|
||||
void Logger::openLogfileSession()
|
||||
{
|
||||
if (logToFileEnabled)
|
||||
{
|
||||
if (logToFileEnabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -77,8 +73,7 @@ void Logger::internalLog(const QString message)
|
|||
QMutexLocker locker(&mutex);
|
||||
|
||||
logBuffer.append(message);
|
||||
if (logBuffer.size() > LOGGER_MAX_ENTRIES)
|
||||
{
|
||||
if (logBuffer.size() > LOGGER_MAX_ENTRIES) {
|
||||
logBuffer.removeAt(1);
|
||||
}
|
||||
|
||||
|
|
@ -93,8 +88,7 @@ QString Logger::getSystemArchitecture()
|
|||
{
|
||||
QString result;
|
||||
|
||||
if (!getClientOperatingSystem().isEmpty())
|
||||
{
|
||||
if (!getClientOperatingSystem().isEmpty()) {
|
||||
result.append(tr("Client Operating System") + ": " + getClientOperatingSystem() + "\n");
|
||||
}
|
||||
|
||||
|
|
@ -106,9 +100,9 @@ QString Logger::getSystemArchitecture()
|
|||
|
||||
QString Logger::getClientOperatingSystem()
|
||||
{
|
||||
#if QT_VERSION >= 0x050400
|
||||
return QSysInfo::prettyProductName();
|
||||
#endif
|
||||
#if QT_VERSION >= 0x050400
|
||||
return QSysInfo::prettyProductName();
|
||||
#endif
|
||||
|
||||
return {};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue