diff --git a/ChangeLog b/ChangeLog index 1829e06f..9e278711 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17784,3 +17784,8 @@ * Fixed a bug that caused a gratuitious 'INALID_FUNC' error to be sent to syslog when used with an ASI card without timescaling support. +2018-10-16 Fred Gleason + * Removed the 'RDGetSqlValue(const QString &table,const QString &name1, + const QString &test1,const QString &name2,const QString &test2, + const QString &name3,const QString &test3,const QString ¶m, + bool *valid=0)' function. diff --git a/lib/rdconf.cpp b/lib/rdconf.cpp index bee9b0d8..3698a285 100644 --- a/lib/rdconf.cpp +++ b/lib/rdconf.cpp @@ -581,35 +581,6 @@ QVariant RDGetSqlValue(const QString &table,const QString &name, } -QVariant RDGetSqlValue(const QString &table, - const QString &name1,const QString &test1, - const QString &name2,const QString &test2, - const QString &name3,const QString &test3, - const QString ¶m,bool *valid) -{ - RDSqlQuery *q; - QString sql; - QVariant v; - - sql="select `"+param+"` from `"+table+"` where "+ - "(`"+name1+"`=\""+RDEscapeString(test1)+"\")&&"+ - "(`"+name2+"`=\""+RDEscapeString(test1)+"\")&&"+ - "(`"+name3+"`=\""+RDEscapeString(test1)+"\")"; - q=new RDSqlQuery(sql); - if(q->isActive()) { - q->first(); - v=q->value(0); - if(valid!=NULL) { - *valid=!q->isNull(0); - } - delete q; - return v; - } - delete q; - return QVariant(); -} - - bool RDIsSqlNull(const QString &table,const QString &name,const QString &test, const QString ¶m,QSqlDatabase *db) { diff --git a/lib/rdconf.h b/lib/rdconf.h index 887eaa7a..59f833c2 100644 --- a/lib/rdconf.h +++ b/lib/rdconf.h @@ -77,11 +77,6 @@ QVariant RDGetSqlValue(const QString &table,const QString &name, bool *valid=0); QVariant RDGetSqlValue(const QString &table,const QString &name,unsigned test, const QString ¶m,bool *valid=0); -QVariant RDGetSqlValue(const QString &table, - const QString &name1,const QString &test1, - const QString &name2,const QString &test2, - const QString &name3,const QString &test3, - const QString ¶m,bool *valid=0); bool RDIsSqlNull(const QString &table,const QString &name, const QString &test,const QString ¶m,QSqlDatabase *db=0); bool RDIsSqlNull(const QString &table,const QString &name,unsigned test,