Skip to content

Commit 5f319c1

Browse files
committed
Editorial changes
1 parent 0f87463 commit 5f319c1

File tree

2 files changed

+3
-35
lines changed

2 files changed

+3
-35
lines changed

libsrc/hyperion/HyperionIManager.cpp

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -309,38 +309,6 @@ bool HyperionIManager::saveName(quint8 instanceId, const QString& name)
309309
return false;
310310
}
311311

312-
//void HyperionIManager::handleFinished(const QString& name)
313-
//{
314-
// Hyperion* rawHyperion = qobject_cast<Hyperion*>(sender());
315-
//
316-
// if (rawHyperion != nullptr)
317-
// {
318-
// quint8 const instanceId = rawHyperion->getInstanceIndex();
319-
//
320-
// _startingInstances.remove(instanceId);
321-
// _runningInstances.remove(instanceId);
322-
//
323-
// emit instanceStateChanged(InstanceState::H_STOPPED, instanceId);
324-
// emit change();
325-
//
326-
// // Manually stop the thread and cleanup
327-
// QThread* thread = rawHyperion->thread();
328-
// if (thread != nullptr)
329-
// {
330-
// thread->quit();
331-
// thread->wait();
332-
// }
333-
//
334-
// Info(_log, "Hyperion instance [%u] - '%s' stopped.", instanceId, QSTRING_CSTR(name));
335-
// }
336-
//
337-
// if (_runningInstances.isEmpty())
338-
// {
339-
// Info(_log, "All Hyperion instances are stopped now.");
340-
// emit areAllInstancesStopped();
341-
// }
342-
//}
343-
344312
void HyperionIManager::handleFinished(const QString& name)
345313
{
346314
Hyperion* rawHyperion = qobject_cast<Hyperion*>(sender());

libsrc/utils/Logger.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Logger::~Logger()
139139
void Logger::write(const Logger::T_LOG_MESSAGE& message)
140140
{
141141
QString location;
142-
if (message.level == Logger::LogLevel::LOG_DEBUG)
142+
if (message.level == LogLevel::LOG_DEBUG)
143143
{
144144
location = QString("%1:%2:%3() | ")
145145
.arg(message.fileName)
@@ -195,7 +195,7 @@ void Logger::Message(LogLevel level, const char* sourceFile, const char* func, u
195195

196196
write(repMsg);
197197
#ifndef _WIN32
198-
if (_syslogEnabled && repMsg.level >= Logger::WARNING)
198+
if (_syslogEnabled && repMsg.level >= LogLevel::LOG_WARNING)
199199
{
200200
syslog(LogLevelSysLog[repMsg.level], "Previous line repeats %d times", RepeatCount.localData());
201201
}
@@ -240,7 +240,7 @@ void Logger::Message(LogLevel level, const char* sourceFile, const char* func, u
240240

241241
write(logMsg);
242242
#ifndef _WIN32
243-
if (_syslogEnabled && level >= Logger::WARNING)
243+
if (_syslogEnabled && level >= LogLevel::LOG_WARNING)
244244
{
245245
syslog(LogLevelSysLog[level], "%s", msg);
246246
}

0 commit comments

Comments
 (0)