Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve compile error

Browse Source
This commit is contained in:
Salanto 2021-08-12 22:03:42 +02:00
parent 9148e522aa
commit 931365d1bd
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/include/config_manager.h
View File

@ -424,17 +424,17 @@ private:
*/
static QSettings* m_discord;
/**
* @brief Pointer to QElapsedTimer to track the uptime of the server.
*/
static QElapsedTimer* m_uptimeTimer;
/**
* @brief Returns a stringlist with the contents of a .txt file from config/text/.
*
* @param Name of the file to load.
*/
static QStringList loadConfigFile(const QString filename);
/**
* @brief Pointer to QElapsedTimer to track the uptime of the server.
*/
static QElapsedTimer* uptimeTimer;
};

6
core/src/config_manager.cpp
View File

@ -20,6 +20,7 @@
QSettings* ConfigManager::m_settings = new QSettings("config/config.ini", QSettings::IniFormat);
QSettings* ConfigManager::m_discord = new QSettings("config/discord.ini", QSettings::IniFormat);
ConfigManager::CommandSettings* ConfigManager::m_commands = new CommandSettings();
QElapsedTimer* ConfigManager::m_uptimeTimer = new QElapsedTimer;
bool ConfigManager::verifyServerConfig()
{
@ -85,8 +86,7 @@ bool ConfigManager::verifyServerConfig()
m_commands->reprimands = (loadConfigFile("reprimands"));
m_commands->gimps = (loadConfigFile("gimp"));
uptimeTimer = new QElapsedTimer;
uptimeTimer->start();
m_uptimeTimer->start();
return true;
}
@ -426,7 +426,7 @@ QUrl ConfigManager::advertiserHTTPIP()
qint64 ConfigManager::uptime()
{
return uptimeTimer->elapsed();
return m_uptimeTimer->elapsed();
}
void ConfigManager::setMotd(const QString f_motd)