Added Query functions. Major renaming of stuff to use camelcase type names.

[rrq/rrqmisc.git] / vector / stringitem.h

diff --git a/vector/stringitem.h b/vector/stringitem.h
index 0923bcd736addd2bcdafe9ad9b6badc07a89f7e0..5cc1a32958d2f9cb2b4fd27245153f8f479ededf 100644 (file)
--- a/vector/stringitem.h
+++ b/vector/stringitem.h
@@ -1,42 +1,12 @@
 #ifndef stringitem_H
 #define stringitem_H
 
-#include <itemkeyfun.h>
+#include <ItemKeyFun.h>
 
 /**
- * The stringitem record declares the itemkeyfun functions for string
+ * The stringitem record declares the ItemKeyFun functions for string
  * items.
  */
-extern itemkeyfun stringitem;
-
-/**
- * This callback function returns the hashcode of a key. The hashcode
- * is used for indexing into the backing vector for finding the an
- * item via its key. The same key must map consistently to the same
- * hashcode while the hashtable contains an item with that key.
- * Different keys map map to the same hashcode, in which case the
- * vector placement is made at the first empty or hole slot following
- * the hashcode index.
- */
-extern unsigned long stringitem_hashcode(itemkeyfun *this,void *key);
-
-/**
- * This callback function determines whether an item has a
- * given key or not.
- */
-extern int stringitem_haskey(itemkeyfun *this,void *item,void *key);
-
-/**
- * This callback function returns the key of an item by considering
- * the arity and schema.
- */
-extern void *stringitem_itemkey(itemkeyfun *this,void *item);
-
-/**
- * This callback function handles a key obtained from the itemkey
- * callback function to reclaim temporary allocation.
- */
-extern void stringitem_releasekey(itemkeyfun *this,void *key);
-
+extern ItemKeyFun stringitem;
 
 #endif