Issue #15 Style

This commit is contained in:
Mat Sutcliffe
2019-02-26 01:51:07 +00:00
parent 5edde582b2
commit 3bd444dfb7

View File

@@ -276,7 +276,7 @@ namespace BlackMisc
} }
break; break;
default: default:
Q_ASSERT_X(false, "CDBusServer::addObject", "Wrong server mode"); Q_ASSERT_X(false, Q_FUNC_INFO, "Wrong server mode");
} }
} }
@@ -298,7 +298,6 @@ namespace BlackMisc
void CDBusServer::removeAllObjects() void CDBusServer::removeAllObjects()
{ {
if (m_objects.isEmpty()) { return; }
for (const QString &path : makeKeysRange(as_const(m_objects))) for (const QString &path : makeKeysRange(as_const(m_objects)))
{ {
switch (m_serverMode) switch (m_serverMode)
@@ -310,13 +309,11 @@ namespace BlackMisc
QDBusConnection::systemBus().unregisterObject(path); QDBusConnection::systemBus().unregisterObject(path);
break; break;
case SERVERMODE_P2P: case SERVERMODE_P2P:
for (QDBusConnection connection : as_const(m_connections))
{ {
for (QDBusConnection connection : as_const(m_connections)) connection.unregisterObject(path);
{
connection.unregisterObject(path);
}
break;
} }
break;
} }
} }
m_objects.clear(); m_objects.clear();