Skip to content
GitLab
Verified Commit 941d2676 authored by ivan tkachenko's avatar ivan tkachenko
Browse files

Fix .nospace() punctuation in logs 

(cherry picked from commit e2683edc)
parent c29f30c1
Hide whitespace changes
Inline Side-by-side
libs/handler.cpp
View file @ 941d2676
......@@ -657,7 +657,7 @@ bool Handler::checkRequestScanRateLimit(const NetworkManager::WirelessDevice::Pt
ret |= lastRequestScan.isValid() && lastRequestScan.msecsTo(now) < NM_REQUESTSCAN_LIMIT_RATE;
// skip the request scan
if (ret) {
qCDebug(PLASMA_NM_LIBS_LOG) << "Last scan finished " << lastScan.msecsTo(now) << "ms ago and last request scan was sent "
qCDebug(PLASMA_NM_LIBS_LOG) << "Last scan finished" << lastScan.msecsTo(now) << "ms ago and last request scan was sent" //
<< lastRequestScan.msecsTo(now) << "ms ago, Skipping scanning interface:" << wifiDevice->interfaceName();
return false;
}
......
libs/models/networkmodel.cpp
View file @ 941d2676
......@@ -330,7 +330,7 @@ void NetworkModel::addActiveConnection(const NetworkManager::ActiveConnection::P
item->setVpnState(state);
}
item->invalidateDetails();
qCDebug(PLASMA_NM_LIBS_LOG) << "Item " << item->name() << ": active connection state changed to " << item->connectionState();
qCDebug(PLASMA_NM_LIBS_LOG).nospace() << "Item " << item->name() << ": active connection state changed to " << item->connectionState();
if (device && device->uni() == item->devicePath()) {
auto deviceStatistics = device->deviceStatistics();
......@@ -364,7 +364,7 @@ void NetworkModel::addAvailableConnection(const QString &connection, const Netwo
item->setDevicePath(device->uni());
item->setDeviceState(device->state());
qCDebug(PLASMA_NM_LIBS_LOG) << "Item " << item->name() << ": device changed to " << item->devicePath();
qCDebug(PLASMA_NM_LIBS_LOG).nospace() << "Item " << item->name() << ": device changed to " << item->devicePath();
#if WITH_MODEMMANAGER_SUPPORT
if (device->type() == NetworkManager::Device::Modem) {
ModemManager::ModemDevice::Ptr modemDevice = ModemManager::findModemDevice(device->udi());
......@@ -372,7 +372,7 @@ void NetworkModel::addAvailableConnection(const QString &connection, const Netwo
ModemManager::Modem::Ptr modemInterface = modemDevice->interface(ModemManager::ModemDevice::ModemInterface).objectCast<ModemManager::Modem>();
if (modemInterface) {
item->setSignal(modemInterface->signalQuality().signal);
qCDebug(PLASMA_NM_LIBS_LOG) << "Item " << item->name() << ": signal changed to " << item->signal();
qCDebug(PLASMA_NM_LIBS_LOG).nospace() << "Item " << item->name() << ": signal changed to " << item->signal();
}
}
}
......@@ -382,7 +382,7 @@ void NetworkModel::addAvailableConnection(const QString &connection, const Netwo
for (NetworkModelItem *secondItem : m_list.returnItems(NetworkItemsList::Ssid, item->ssid())) {
if (secondItem->itemType() == NetworkModelItem::AvailableAccessPoint && secondItem->devicePath() == item->devicePath()) {
removeItem(secondItem);
qCDebug(PLASMA_NM_LIBS_LOG) << "Access point " << secondItem->name() << ": merged to " << item->name() << " connection";
qCDebug(PLASMA_NM_LIBS_LOG).nospace() << "Access point " << secondItem->name() << ": merged to " << item->name() << " connection";
break;
}
}
......@@ -444,7 +444,7 @@ void NetworkModel::addConnection(const NetworkManager::Connection::Ptr &connecti
item->invalidateDetails();
insertItem(item);
qCDebug(PLASMA_NM_LIBS_LOG) << "New connection " << item->name() << " added";
qCDebug(PLASMA_NM_LIBS_LOG) << "New connection" << item->name() << "added";
}
void NetworkModel::addDevice(const NetworkManager::Device::Ptr &device)
......@@ -540,7 +540,7 @@ void NetworkModel::addWirelessNetwork(const NetworkManager::WirelessNetwork::Ptr
item->invalidateDetails();
insertItem(item);
qCDebug(PLASMA_NM_LIBS_LOG) << "New wireless network " << item->name() << " added";
qCDebug(PLASMA_NM_LIBS_LOG) << "New wireless network" << item->name() << "added";
}
void NetworkModel::checkAndCreateDuplicate(const QString &connection, const QString &deviceUni)
......@@ -643,7 +643,7 @@ void NetworkModel::accessPointSignalStrengthChanged(int signal)
if (item->specificPath() == apPtr->uni()) {
item->setSignal(signal);
updateItem(item);
qCDebug(PLASMA_NM_LIBS_LOG) << "AccessPoint " << item->name() << ": signal changed to " << item->signal();
qCDebug(PLASMA_NM_LIBS_LOG).nospace() << "AccessPoint " << item->name() << ": signal changed to " << item->signal();
}
}
}
......@@ -664,7 +664,7 @@ void NetworkModel::activeConnectionRemoved(const QString &activeConnection)
item->setConnectionState(NetworkManager::ActiveConnection::Deactivated);
item->setVpnState(NetworkManager::VpnConnection::Disconnected);
updateItem(item);
qCDebug(PLASMA_NM_LIBS_LOG) << "Item " << item->name() << ": active connection removed";
qCDebug(PLASMA_NM_LIBS_LOG).nospace() << "Item " << item->name() << ": active connection removed";
}
}
......@@ -705,7 +705,7 @@ void NetworkModel::activeVpnConnectionStateChanged(NetworkManager::VpnConnection
}
item->setVpnState(state);
updateItem(item);
qCDebug(PLASMA_NM_LIBS_LOG) << "Item " << item->name() << ": active connection changed to " << item->connectionState();
qCDebug(PLASMA_NM_LIBS_LOG).nospace() << "Item " << item->name() << ": active connection changed to " << item->connectionState();
}
}
......@@ -747,7 +747,7 @@ void NetworkModel::availableConnectionDisappeared(const QString &connection)
item->setDeviceState(NetworkManager::Device::UnknownState);
item->setSignal(0);
item->setSpecificPath(QString());
qCDebug(PLASMA_NM_LIBS_LOG) << "Item " << item->name() << " removed as available connection";
qCDebug(PLASMA_NM_LIBS_LOG) << "Item" << item->name() << "removed as available connection";
// Check whether the connection is still available as an access point, this happens
// when we change its properties, like ssid, bssid, security etc.
if (item->type() == NetworkManager::ConnectionSettings::Wireless && !specificPath.isEmpty()) {
......@@ -767,7 +767,7 @@ void NetworkModel::availableConnectionDisappeared(const QString &connection)
if (item->duplicate()) {
removeItem(item);
qCDebug(PLASMA_NM_LIBS_LOG) << "Duplicate item " << item->name() << " removed completely";
qCDebug(PLASMA_NM_LIBS_LOG) << "Duplicate item" << item->name() << "removed completely";
} else {
updateItem(item);
}
......@@ -811,7 +811,7 @@ void NetworkModel::connectionRemoved(const QString &connection)
item->setTimestamp(QDateTime());
item->setUuid(QString());
updateItem(item);
qCDebug(PLASMA_NM_LIBS_LOG) << "Item " << item->name() << ": connection removed";
qCDebug(PLASMA_NM_LIBS_LOG).nospace() << "Item " << item->name() << ": connection removed";
}
} else {
remove = true;
......@@ -819,7 +819,7 @@ void NetworkModel::connectionRemoved(const QString &connection)
if (remove) {
removeItem(item);
qCDebug(PLASMA_NM_LIBS_LOG) << "Item " << item->name() << " removed completely";
qCDebug(PLASMA_NM_LIBS_LOG) << "Item" << item->name() << "removed completely";
}
remove = false;
}
......@@ -850,7 +850,7 @@ void NetworkModel::connectionUpdated()
}
updateItem(item);
qCDebug(PLASMA_NM_LIBS_LOG) << "Item " << item->name() << ": connection updated";
qCDebug(PLASMA_NM_LIBS_LOG).nospace() << "Item " << item->name() << ": connection updated";
}
}
......@@ -1024,7 +1024,7 @@ void NetworkModel::statusChanged(NetworkManager::Status status)
{
Q_UNUSED(status);
qCDebug(PLASMA_NM_LIBS_LOG) << "NetworkManager state changed to " << status;
qCDebug(PLASMA_NM_LIBS_LOG) << "NetworkManager state changed to" << status;
// This has probably effect only for VPN connections
for (NetworkModelItem *item : m_list.returnItems(NetworkItemsList::Type, NetworkManager::ConnectionSettings::Vpn)) {
updateItem(item);
......@@ -1052,7 +1052,7 @@ void NetworkModel::wirelessNetworkDisappeared(const QString &ssid)
// Remove the entire item, because it's only AP or it's a duplicated available connection
if (item->itemType() == NetworkModelItem::AvailableAccessPoint || item->duplicate()) {
removeItem(item);
qCDebug(PLASMA_NM_LIBS_LOG) << "Wireless network " << item->name() << " removed completely";
qCDebug(PLASMA_NM_LIBS_LOG) << "Wireless network" << item->name() << "removed completely";
// Remove only AP and device from the item and leave it as an unavailable connection
} else {
if (item->mode() == NetworkManager::WirelessSetting::Infrastructure) {
......@@ -1062,7 +1062,7 @@ void NetworkModel::wirelessNetworkDisappeared(const QString &ssid)
}
item->setSignal(0);
updateItem(item);
qCDebug(PLASMA_NM_LIBS_LOG) << "Item " << item->name() << ": wireless network removed";
qCDebug(PLASMA_NM_LIBS_LOG).nospace() << "Item " << item->name() << ": wireless network removed";
}
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment