Index: trunk/ippTools/src/detselect.h
===================================================================
--- trunk/ippTools/src/detselect.h	(revision 18322)
+++ trunk/ippTools/src/detselect.h	(revision 18561)
@@ -31,98 +31,3 @@
 pxConfig *detselectConfig(pxConfig *config, int argc, char **argv);
 
-#define addWhereStr(name) \
-{ \
-    psString str = NULL; \
-    bool status = false; \
-    if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \
-        if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\
-            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
-            psFree(config); \
-            return NULL; \
-        } \
-    } \
-}
-
-#define addWhereStrAlias(name,realname) \
-{ \
-    psString str = NULL; \
-    bool status = false; \
-    if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \
-        if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #realname, 0, "==", str)) {\
-            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
-            psFree(config); \
-            return NULL; \
-        } \
-    } \
-}
-
-#define addWhereS32(name) \
-{ \
-    psS32 s32 = 0; \
-    bool status = false; \
-    if ((s32= psMetadataLookupS32(&status, config->args, "-" #name))) { \
-        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, #name, 0, "==", s32)) { \
-            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
-            psFree(config); \
-            return NULL; \
-        } \
-    } \
-}
-
-#define addWhereF32(name) \
-{ \
-    psF32 var = 0; \
-    bool status = false; \
-    if ((var = psMetadataLookupF32(&status, config->args, "-" #name))) { \
-        if (!isnan(var)) { \
-            if (!psMetadataAddF32(config->where, PS_LIST_TAIL, #name, 0, "==", var)) { \
-                psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
-                psFree(config); \
-                return NULL; \
-            } \
-        } \
-    } \
-}
-
-#define addWhereF64(name) \
-{ \
-    psF64 var = 0; \
-    bool status = false; \
-    if ((var = psMetadataLookupF64(&status, config->args, "-" #name))) { \
-        if (!isnan(var))  { \
-            if (!psMetadataAddF64(config->where, PS_LIST_TAIL, #name, 0, "==", var)) { \
-                psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
-                psFree(config); \
-                return NULL; \
-            } \
-        } \
-    } \
-}
-
-#define addWhereTimeStr(name) \
-{ \
-    psString str = NULL; \
-    bool status = false; \
-    if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \
-        psTime *time = psTimeFromISO(str, PS_TIME_UTC); \
-        if (!time) { \
-            psError(PS_ERR_UNKNOWN, false, "failed to convert " #name " into a psTime object"); \
-            psFree(config); \
-            return NULL; \
-        } \
-        psMetadataItem *item = psMetadataLookup(config->args, "-" #name); \
-        if (item) { \
-            str = item->comment; \
-        } else { \
-            str = NULL; \
-        } \
-        if (!psMetadataAddTime(config->where, PS_LIST_TAIL, #name, 0, str, time)) {\
-            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
-            psFree(config); \
-            return NULL; \
-        } \
-        psFree(time); \
-    } \
-}
-
 #endif // DETSELECT_H