HeaderMap->HeaderHash and make it a property of the request

nikhilm · nikhilm · commit 22135320b1ba · 2011-02-07T17:30:45.000+05:30
diff --git a/src/qhttpconnection.h b/src/qhttpconnection.h
@@ -33,7 +33,7 @@ class QTcpSocket;
 class QHttpRequest;
 class QHttpResponse;
 
-typedef QHash<QString, QString> HeaderMap;
+typedef QHash<QString, QString> HeaderHash;
 
 class QHttpConnection : public QObject
 {
@@ -75,7 +75,7 @@ private slots:
     QHttpRequest *m_request;
 
     // the ones we are reading in from the parser
-    HeaderMap m_currentHeaders;
+    HeaderHash m_currentHeaders;
     QString m_currentHeaderField;
     QString m_currentHeaderValue;
 };
diff --git a/src/qhttprequest.h b/src/qhttprequest.h
@@ -25,13 +25,14 @@
 
 #include <QObject>
 #include <QHash>
+#include <QMetaType>
 #include <QUrl>
 
 class QTcpSocket;
 
 class QHttpConnection;
 
-typedef QHash<QString, QString> HeaderMap;
+typedef QHash<QString, QString> HeaderHash;
 
 /*! \class QHttpRequest
  *
@@ -52,6 +53,8 @@ class QHttpRequest : public QObject
 {
     Q_OBJECT
 
+    Q_PROPERTY(HeaderHash headers READ headers);
+
 public:
     virtual ~QHttpRequest();
 
@@ -107,7 +110,7 @@ class QHttpRequest : public QObject
      * somewhere else, where the request may be deleted,
      * make sure you store them as a copy.
      */
-    const HeaderMap& headers() const { return m_headers; };
+    const HeaderHash& headers() const { return m_headers; };
 
     /*!
      * Get the value of a header
@@ -137,10 +140,10 @@ class QHttpRequest : public QObject
     void setMethod(const QString &method) { m_method = method; }
     void setVersion(const QString &version) { m_version = version; }
     void setUrl(const QUrl &url) { m_url = url; }
-    void setHeaders(const HeaderMap headers) { m_headers = headers; }
+    void setHeaders(const HeaderHash headers) { m_headers = headers; }
 
     QHttpConnection *m_connection;
-    HeaderMap m_headers;
+    HeaderHash m_headers;
     QString m_method;
     QUrl m_url;
     QString m_version;
diff --git a/src/qhttpresponse.h b/src/qhttpresponse.h
@@ -31,6 +31,8 @@ class QTcpSocket;
 
 class QHttpConnection;
 
+typedef QHash<QString, QString> HeaderHash;
+
 /*!
  * The QHttpResponse class handles sending
  * data back to the client in response to a request.
@@ -109,7 +111,7 @@ public slots:
     QHttpConnection *m_connection;
 
     bool m_headerWritten;
-    QHash<QString, QString> m_headers;
+    HeaderHash m_headers;
     friend class QHttpConnection;
 
     bool m_sentConnectionHeader;
diff --git a/src/qhttpserver.h b/src/qhttpserver.h
@@ -38,7 +38,7 @@ class QHttpResponse;
 /*!
  * A map of request or response headers
  */
-typedef QHash<QString, QString> HeaderMap;
+typedef QHash<QString, QString> HeaderHash;
 
 /*!
  * Maps status codes to string reason phrases
