[vidalia-svn] r2305: Add a GeoIpRequest::size() method and const-ify my world a b (in vidalia/trunk: . src/vidalia/network)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-01-18 19:38:02 -0500 (Fri, 18 Jan 2008)
New Revision: 2305

Modified:
   vidalia/trunk/
   vidalia/trunk/src/vidalia/network/geoiprequest.cpp
   vidalia/trunk/src/vidalia/network/geoiprequest.h
Log:
 r45@lysithea:  edmanm | 2008-01-18 19:35:55 -0500
 Add a GeoIpRequest::size() method and const-ify my world a bit more.



Property changes on: vidalia/trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r45] on 90112fd6-a33b-4cea-8d39-48ff1d78625c

Modified: vidalia/trunk/src/vidalia/network/geoiprequest.cpp
===================================================================
--- vidalia/trunk/src/vidalia/network/geoiprequest.cpp	2008-01-18 21:15:45 UTC (rev 2304)
+++ vidalia/trunk/src/vidalia/network/geoiprequest.cpp	2008-01-19 00:38:02 UTC (rev 2305)
@@ -33,7 +33,7 @@
 /** Creates an HTTP POST header for this request, based on the 
  * Host, Page, and content-length values. */
 QHttpRequestHeader
-GeoIpRequest::createHeader()
+GeoIpRequest::createHeader() const
 {
   QHttpRequestHeader header("POST", _page, 1, 1);
   
@@ -55,7 +55,7 @@
 
 /** Sets the list of IPs whose geo information we want to request. */
 void
-GeoIpRequest::setRequest(QList<QHostAddress> ips)
+GeoIpRequest::setRequest(const QList<QHostAddress> &ips)
 {
   _request = "ip=";
   int ipcount = ips.size();
@@ -72,7 +72,7 @@
 
 /** Formats the request as an HTTP POST request. */
 QByteArray
-GeoIpRequest::request()
+GeoIpRequest::request() const
 {
   /* Create the header and append the request content. */
   QString request = createHeader().toString() + _request;
@@ -81,7 +81,7 @@
 
 /** Returns true if this request contains <b>ip</b>. */
 bool
-GeoIpRequest::contains(QHostAddress ip)
+GeoIpRequest::contains(const QHostAddress &ip) const
 {
   return _ips.contains(ip);
 }

Modified: vidalia/trunk/src/vidalia/network/geoiprequest.h
===================================================================
--- vidalia/trunk/src/vidalia/network/geoiprequest.h	2008-01-18 21:15:45 UTC (rev 2304)
+++ vidalia/trunk/src/vidalia/network/geoiprequest.h	2008-01-19 00:38:02 UTC (rev 2305)
@@ -42,22 +42,24 @@
   GeoIpRequest(int id) : _id(id) {}
   
   /** Sets the Host: field in this request's header. */
-  void setHost(QString host) { _host = host; }
+  void setHost(const QString &host) { _host = host; }
   /** Sets the page path in this request's header. */
-  void setPage(QString page) { _page = page; }
+  void setPage(const QString &page) { _page = page; }
   /** Sets the list of IPs whose geo information we want to request. */
-  void setRequest(QList<QHostAddress> ips);
+  void setRequest(const QList<QHostAddress> &ips);
   /** Returns true if this request contains <b>ip</b>. */
-  bool contains(QHostAddress ip);
+  bool contains(const QHostAddress &ip) const;
 
   /** Returns the request's identifier. */
-  int id() { return _id; }
+  int id() const { return _id; }
+  /** Returns the number of IP addresses contained in this request. */
+  int size() const { return _ips.size(); }
   /** Formats the request as an HTTP POST request */
-  QByteArray request();
+  QByteArray request() const;
   
 private:
   /** Creates an HTTP header for this request. */
-  QHttpRequestHeader createHeader();
+  QHttpRequestHeader createHeader() const;
   
   int _id;          /**< Request identifier */
   QString _host;    /**< Host: field value. */