[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r4039: Slightly deuglied my log message in NetworkMapPlugin (vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin)
Author: tyree731
Date: 2009-08-13 21:15:56 -0400 (Thu, 13 Aug 2009)
New Revision: 4039
Modified:
vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/GeoIpResolver.cpp
Log:
Slightly deuglied my log message in NetworkMapPlugin
Modified: vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/GeoIpResolver.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/GeoIpResolver.cpp 2009-08-14 01:02:10 UTC (rev 4038)
+++ vidalia/branches/extension-api/src/vidalia/NetworkMapPlugin/GeoIpResolver.cpp 2009-08-14 01:15:56 UTC (rev 4039)
@@ -198,9 +198,9 @@
qDebug() << QString("Ignored improperly formatted GeoIP record (request id %1): %2").arg(line).arg(request->id());
} else {
/* This item wasn't requested, so just log it and ignore. */
- qWarning() << (QString("Received a GeoIP entry for IP address %1 that") +
- QString(" was not included in the initial request.") +
- QString("request id %2)")).arg(ip.toString()).arg(request->id());
+ qWarning() << QString("Received a GeoIP entry for IP address %1 that"
+ " was not included in the initial request."
+ "request id %2)").arg(ip.toString()).arg(request->id());
}
}
/* If new results were cached, save them to disk */
@@ -229,8 +229,8 @@
GeoIpRequest *req = static_cast<GeoIpRequest *>(_requestList.take(socket));
emit resolveFailed(req->id(), errorString);
socket->abort();
- qWarning() << (QString("GeoIP request socket error ") +
- QString("(request id %1): %2")).arg(req->id()).arg(errorString);
+ qWarning() << QString("GeoIP request socket error "
+ "(request id %1): %2").arg(req->id()).arg(errorString);
delete socket;
delete req;
}
@@ -271,9 +271,8 @@
_requestList.insert(socket, request);
/* Connect so we can send our request and return the request ID. */
- qDebug() << (QString("Opening an SSL connection to the GeoIP host at ") +
- QString("%1:%2 (request id %3)"))
- .arg(GEOIP_HOST).arg(GEOIP_SSL_PORT).arg(request->id());
+ qDebug() << QString("Opening an SSL connection to the GeoIP host at "
+ "%1:%2 (request id %3)").arg(GEOIP_HOST).arg(GEOIP_SSL_PORT).arg(request->id());
socket->connectToRemoteHost(GEOIP_HOST, GEOIP_SSL_PORT, true);
return request->id();