summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiepim/private/opimcontactsortvector.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/libopie2/opiepim/private/opimcontactsortvector.cpp b/libopie2/opiepim/private/opimcontactsortvector.cpp
index 9e186fe..8c7d5ca 100644
--- a/libopie2/opiepim/private/opimcontactsortvector.cpp
+++ b/libopie2/opiepim/private/opimcontactsortvector.cpp
@@ -20,83 +20,87 @@
++= -. .` .: details.
: = ...= . :.=-
-. .:....=;==+<; You should have received a copy of the GNU
-_. . . )=. = Library General Public License along with
-- :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include "opimcontactsortvector.h"
#include <opie2/ocontactaccess.h>
namespace Opie {
namespace Internal {
OPimContactSortVector::OPimContactSortVector( uint size, bool asc, int sort )
: OPimSortVector<OPimContact>( size, asc, sort ) {}
int OPimContactSortVector::compareItems( const OPimContact& left,
const OPimContact& right ) {
if ( left.uid() == right.uid() )
return 0;
bool soTitle, soSummary, soFirstName, soMiddleName, soSuffix, soEmail,
- soNick, soAnni, soBirth, soGender;
+ soNick, soFileAs, soAnni, soBirth, soGender;
soTitle = soSummary = soFirstName = soMiddleName = soSuffix = soEmail =
- soNick = soAnni = soBirth = soGender = false;
+ soNick = soFileAs = soAnni = soBirth = soGender = false;
int ret = 0;
bool asc = sortAscending();
switch( sortOrder() ) {
case OPimContactAccess::SortSummary:
ret = testString( left.fileAs(), right.fileAs() );
soSummary = true;
break;
case OPimContactAccess::SortTitle:
ret = testString( left.title(), right.title() );
soTitle = true;
break;
case OPimContactAccess::SortFirstName:
ret = testString( left.firstName(), right.firstName() );
soFirstName = true;
break;
case OPimContactAccess::SortMiddleName:
ret = testString( left.middleName(), right.middleName() );
soMiddleName = true;
break;
case OPimContactAccess::SortSuffix:
ret = testString( left.suffix(), right.suffix() );
soSuffix = true;
break;
case OPimContactAccess::SortEmail:
ret = testString( left.defaultEmail(), right.defaultEmail() );
soEmail = true;
break;
case OPimContactAccess::SortNickname:
ret = testString( left.nickname(), right.nickname() );
soNick = true;
break;
+ case OPimContactAccess::SortFileAsName:
+ ret = testString( left.fileAs(), right.fileAs() );
+ soFileAs = true;
+ break;
case OPimContactAccess::SortAnniversary:
ret = testDate( left.anniversary(), right.anniversary() );
soAnni = true;
break;
case OPimContactAccess::SortByDate:
case OPimContactAccess::SortBirthday:
ret = testDate( left.birthday(), right.birthday() );
soBirth = true;
break;
case OPimContactAccess::SortGender:
ret = testString( left.gender(), right.gender() );
soGender = true;
break;
}
/* twist to honor ascending/descending setting as QVector only sorts ascending*/
if ( !asc )
ret *= -1;
// Maybe differentiate as in OPimTodoSortVector ### FIXME
// if( ret )
return ret;
}