1 files changed, 0 insertions, 134 deletions

diff --git a/cpp/src/qpid/framing/FieldTable.cpp b/cpp/src/qpid/framing/FieldTable.cpp
index 0a21bb2f35..e2e91e450a 100644
--- a/cpp/src/qpid/framing/FieldTable.cpp
+++ b/cpp/src/qpid/framing/FieldTable.cpp
@@ -53,23 +53,6 @@ uint32_t FieldTable::encodedSize() const {
     return len;
 }
 
-uint32_t FieldTable::qmfEncodedSize() const {
-    uint32_t len(4/*size field*/ + 4/*count field*/);
-    for(ValueMap::const_iterator i = values.begin(); i != values.end(); ++i) {
-        // shortstr_len_byte + key size + typecode
-	len += 1 + (i->first).size() + 1;
-        ValuePtr value(i->second);
-        if (value->convertsTo<int>()) {
-            len += 4;
-        } else if (value->convertsTo<uint64_t>()) {
-            len += 8;
-        } else if (value->convertsTo<string>()) {
-            len += 2 + value->get<string>().size();
-        }
-    }
-    return len;
-}
-
 int FieldTable::count() const {
     return values.size();
 }
@@ -232,123 +215,6 @@ void FieldTable::decode(Buffer& buffer){
     }
 }
 
-#define QMF_TYPE_U8        1
-#define QMF_TYPE_U16       2
-#define QMF_TYPE_U32       3
-#define QMF_TYPE_U64       4
-#define QMF_TYPE_SSTR      6                   
-#define QMF_TYPE_LSTR      7
-#define QMF_TYPE_ABSTIME   8
-#define QMF_TYPE_DELTATIME 9
-#define QMF_TYPE_REF       10
-#define QMF_TYPE_BOOL      11
-#define QMF_TYPE_FLOAT     12
-#define QMF_TYPE_DOUBLE    13
-#define QMF_TYPE_UUID      14
-#define QMF_TYPE_S8        16
-#define QMF_TYPE_S16       17
-#define QMF_TYPE_S32       18
-#define QMF_TYPE_S64       19
-#define QMF_TYPE_OBJECT    20
-#define QMF_TYPE_MAP       15
-#define QMF_TYPE_LIST      21
-#define QMF_TYPE_ARRAY     22
-
-void FieldTable::qmfEncode(Buffer& buffer) const {
-    buffer.putLong(qmfEncodedSize() - 4);
-    buffer.putLong(values.size());
-    for (ValueMap::const_iterator i = values.begin(); i!=values.end(); ++i) {
-        ValuePtr value(i->second);
-        buffer.putShortString(i->first);
-        if (value->convertsTo<int>()) {
-            buffer.putOctet(QMF_TYPE_S32);
-            buffer.putLong(value->get<int>());
-        } else if (value->convertsTo<uint64_t>()) {
-            buffer.putOctet(QMF_TYPE_U64);
-            buffer.putLongLong(value->get<uint64_t>());
-        } else if (value->convertsTo<string>()) {
-            buffer.putOctet(QMF_TYPE_LSTR);
-            buffer.putMediumString(value->get<string>());
-        }
-    }
-}
-
-void FieldTable::qmfDecode(Buffer& buffer) {
-    clear();
-    uint32_t len = buffer.getLong();
-    if (len) {
-        uint32_t available = buffer.available();
-        if (available < len)
-            throw IllegalArgumentException(QPID_MSG("Not enough data for  field table."));
-        uint32_t count = buffer.getLong();
-        uint32_t leftover = available - len;
-        while(buffer.available() > leftover && count--) {
-            std::string name;
-            std::string sstr;
-            std::string lstr;
-            buffer.getShortString(name);
-            uint8_t typecode = buffer.getOctet();
-            switch (typecode) {
-            case QMF_TYPE_U8:
-                values[name] = ValuePtr(new IntegerValue(buffer.getOctet()));
-                break;
-            case QMF_TYPE_U16:
-                values[name] = ValuePtr(new IntegerValue(buffer.getShort()));
-                break;
-            case QMF_TYPE_U32:
-                values[name] = ValuePtr(new IntegerValue(buffer.getLong()));
-                break;
-            case QMF_TYPE_U64:
-                values[name] = ValuePtr(new Unsigned64Value(buffer.getLongLong()));
-                break;
-            case QMF_TYPE_SSTR:
-                buffer.getShortString(sstr);
-                values[name] = ValuePtr(new Str16Value(sstr));
-                break;
-            case QMF_TYPE_LSTR:
-                buffer.getMediumString(lstr);
-                values[name] = ValuePtr(new Str16Value(lstr));
-                break;
-            case QMF_TYPE_ABSTIME:
-                values[name] = ValuePtr(new Unsigned64Value(buffer.getLongLong()));
-                break;
-            case QMF_TYPE_DELTATIME:
-                values[name] = ValuePtr(new Unsigned64Value(buffer.getLongLong()));
-                break;
-            case QMF_TYPE_BOOL:
-                values[name] = ValuePtr(new IntegerValue(buffer.getOctet()));
-                break;
-            case QMF_TYPE_FLOAT:
-                values[name] = ValuePtr(new FloatValue(buffer.getFloat()));
-                break;
-            case QMF_TYPE_DOUBLE:
-                values[name] = ValuePtr(new DoubleValue(buffer.getDouble()));
-                break;
-            case QMF_TYPE_S8:
-                values[name] = ValuePtr(new IntegerValue(buffer.getOctet()));
-                break;
-            case QMF_TYPE_S16:
-                values[name] = ValuePtr(new IntegerValue(buffer.getShort()));
-                break;
-            case QMF_TYPE_S32:
-                values[name] = ValuePtr(new IntegerValue(buffer.getLong()));
-                break;
-            case QMF_TYPE_S64:
-                values[name] = ValuePtr(new Unsigned64Value(buffer.getLongLong()));
-                break;
-            case QMF_TYPE_REF:
-            case QMF_TYPE_UUID:
-            case QMF_TYPE_OBJECT:
-            case QMF_TYPE_MAP:
-            case QMF_TYPE_LIST:
-            case QMF_TYPE_ARRAY:
-                break;
-            }
-        }    
-    }
-}
-
-
 bool FieldTable::operator==(const FieldTable& x) const {
     if (values.size() != x.values.size()) return false;
     for (ValueMap::const_iterator i =  values.begin(); i != values.end(); ++i) {