diff options
Diffstat (limited to 'digikam/kioslave/digikamsearch.cpp')
| -rw-r--r-- | digikam/kioslave/digikamsearch.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/digikam/kioslave/digikamsearch.cpp b/digikam/kioslave/digikamsearch.cpp index a23e66a8..d4aa0580 100644 --- a/digikam/kioslave/digikamsearch.cpp +++ b/digikam/kioslave/digikamsearch.cpp @@ -471,8 +471,8 @@ 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.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) - + TQString::tqfromLatin1("'")); + query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) + + TQString::fromLatin1("'")); break; } case(ALBUMNAME): @@ -516,8 +516,8 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, // " (SELECT imageid FROM ImageTags " // " WHERE tagid $$##$$ $$@@$$)) "; - query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) - + TQString::tqfromLatin1("'")); + query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) + + TQString::fromLatin1("'")); break; } @@ -544,8 +544,8 @@ 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.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) -// + TQString::tqfromLatin1("'")); +// query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) +// + TQString::fromLatin1("'")); break; } @@ -596,57 +596,57 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, case(EQ): { query.replace("$$##$$", "="); - query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) - + TQString::tqfromLatin1("'")); + query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) + + TQString::fromLatin1("'")); break; } case(NE): { query.replace("$$##$$", "<>"); - query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) - + TQString::tqfromLatin1("'")); + query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) + + TQString::fromLatin1("'")); break; } case(LT): { query.replace("$$##$$", "<"); - query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) - + TQString::tqfromLatin1("'")); + query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) + + TQString::fromLatin1("'")); break; } case(GT): { query.replace("$$##$$", ">"); - query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) - + TQString::tqfromLatin1("'")); + query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) + + TQString::fromLatin1("'")); break; } case(LTE): { query.replace("$$##$$", "<="); - query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) - + TQString::tqfromLatin1("'")); + query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) + + TQString::fromLatin1("'")); break; } case(GTE): { query.replace("$$##$$", ">="); - query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) - + TQString::tqfromLatin1("'")); + query.replace("$$@@$$", TQString::fromLatin1("'") + escapeString(val) + + TQString::fromLatin1("'")); break; } case(LIKE): { query.replace("$$##$$", "LIKE"); - query.replace("$$@@$$", TQString::tqfromLatin1("'%") + escapeString(val) - + TQString::tqfromLatin1("%'")); + query.replace("$$@@$$", TQString::fromLatin1("'%") + escapeString(val) + + TQString::fromLatin1("%'")); break; } case(NLIKE): { query.replace("$$##$$", "NOT LIKE"); - query.replace("$$@@$$", TQString::tqfromLatin1("'%") + escapeString(val) - + TQString::tqfromLatin1("%'")); + query.replace("$$@@$$", TQString::fromLatin1("'%") + escapeString(val) + + TQString::fromLatin1("%'")); break; } } @@ -708,7 +708,7 @@ TQString kio_digikamsearch::possibleDate(const TQString& str, bool& exact) const if (ok) { // ok. its an int, does it look like a year? - if (1970 <= num && num <= TQDate::tqcurrentDate().year()) + if (1970 <= num && num <= TQDate::currentDate().year()) { // very sure its a year return TQString("%1-%-%").tqarg(num); |