summaryrefslogtreecommitdiff
authorzecke <zecke>2005-06-27 18:08:35 (UTC)
committer zecke <zecke>2005-06-27 18:08:35 (UTC)
commitcecffa1dc3a7bd1526be00e7bc4a4a151e6f2c9c (patch) (side-by-side diff)
treef1507ae7e0ba8d3c41e0381b84827c97823edeca
parent058e3b6b0bc8f29314ee794bf7e993ebf3bfe072 (diff)
downloadopie-cecffa1dc3a7bd1526be00e7bc4a4a151e6f2c9c.zip
opie-cecffa1dc3a7bd1526be00e7bc4a4a151e6f2c9c.tar.gz
opie-cecffa1dc3a7bd1526be00e7bc4a4a151e6f2c9c.tar.bz2
-Fix compile warning (signed vs unsigned)
-Somehow the split up patches missed the query string... (I knew I would mess up)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
index 6aaa14c..f684f8c 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
@@ -645,13 +645,13 @@ UIDArray OPimContactAccessBackend_SQL::queryByExample ( const UIDArray& uidlist,
}
delete endDate;
// The following if line is a replacement for
// if ( searchQuery.endsWith( "AND" ) )
- if ( searchQuery.findRev( "AND" ) == ( searchQuery.length() - 3 ) ){
+ if ( searchQuery.findRev( "AND" ) == static_cast<int>( searchQuery.length() - 3 ) ){
odebug << "remove AND" << oendl;
searchQuery.remove( searchQuery.length()-3, 3 ); // Hmmmm..
}
}
@@ -870,12 +870,18 @@ UIDArray OPimContactAccessBackend_SQL::sorted( const UIDArray& ar, bool asc, int
case OPimContactAccess::SortBirthday:
query += " \"Birthday\"";
break;
case OPimContactAccess::SortGender:
query += " \"Gender\"";
break;
+ case OPimContactAccess::SortBirthdayWithoutYear:
+ query += " substr(\"Birthday\", 6, 10)";
+ break;
+ case OPimContactAccess::SortAnniversaryWithoutYear:
+ query += " substr(\"Anniversary\", 6, 10)";
+ break;
default:
query += " \"Last Name\"";
}
if ( !asc )
query += " DESC";