diff options
Diffstat (limited to 'digikam/kioslave/digikamsearch.cpp')
| -rw-r--r-- | digikam/kioslave/digikamsearch.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/digikam/kioslave/digikamsearch.cpp b/digikam/kioslave/digikamsearch.cpp index d45db620..a23e66a8 100644 --- a/digikam/kioslave/digikamsearch.cpp +++ b/digikam/kioslave/digikamsearch.cpp @@ -92,8 +92,8 @@ static TQValueList<TQRegExp> makeFilterList( const TQString &filter ) return regExps; TQChar sep( ';' ); - int i = filter.tqfind( sep, 0 ); - if ( i == -1 && filter.tqfind( ' ', 0 ) != -1 ) + int i = filter.find( sep, 0 ); + if ( i == -1 && filter.find( ' ', 0 ) != -1 ) sep = TQChar( ' ' ); TQStringList list = TQStringList::split( sep, filter ); @@ -471,7 +471,7 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, query = " (Images.dirid IN " " (SELECT a.id FROM Albums a, Albums b " " WHERE a.url $$##$$ '%' || b.url || '%' AND b.id = $$@@$$))"; - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + TQString::tqfromLatin1("'")); break; } @@ -516,7 +516,7 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, // " (SELECT imageid FROM ImageTags " // " WHERE tagid $$##$$ $$@@$$)) "; - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + TQString::tqfromLatin1("'")); break; @@ -544,7 +544,7 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, " WHERE TagsTree.pid = (SELECT id FROM Tags WHERE name LIKE $$@@$$) " " OR ImageTags.tagid = (SELECT id FROM Tags WHERE name LIKE $$@@$$) )) "; -// query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) +// query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) // + TQString::tqfromLatin1("'")); break; @@ -595,57 +595,57 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, { case(EQ): { - query.tqreplace("$$##$$", "="); - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + query.replace("$$##$$", "="); + query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + TQString::tqfromLatin1("'")); break; } case(NE): { - query.tqreplace("$$##$$", "<>"); - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + query.replace("$$##$$", "<>"); + query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + TQString::tqfromLatin1("'")); break; } case(LT): { - query.tqreplace("$$##$$", "<"); - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + query.replace("$$##$$", "<"); + query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + TQString::tqfromLatin1("'")); break; } case(GT): { - query.tqreplace("$$##$$", ">"); - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + query.replace("$$##$$", ">"); + query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + TQString::tqfromLatin1("'")); break; } case(LTE): { - query.tqreplace("$$##$$", "<="); - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + query.replace("$$##$$", "<="); + query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + TQString::tqfromLatin1("'")); break; } case(GTE): { - query.tqreplace("$$##$$", ">="); - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + query.replace("$$##$$", ">="); + query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + TQString::tqfromLatin1("'")); break; } case(LIKE): { - query.tqreplace("$$##$$", "LIKE"); - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'%") + escapeString(val) + query.replace("$$##$$", "LIKE"); + query.replace("$$@@$$", TQString::tqfromLatin1("'%") + escapeString(val) + TQString::tqfromLatin1("%'")); break; } case(NLIKE): { - query.tqreplace("$$##$$", "NOT LIKE"); - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'%") + escapeString(val) + query.replace("$$##$$", "NOT LIKE"); + query.replace("$$@@$$", TQString::tqfromLatin1("'%") + escapeString(val) + TQString::tqfromLatin1("%'")); break; } |