summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/ablabel.cpp2
-rw-r--r--core/pim/addressbook/abtable.cpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index 6b8e4dd..139030d 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -47,49 +47,49 @@ void AbLabel::setContacts( const Opie::OPimContactAccess::List& viewList )
47} 47}
48 48
49int AbLabel::currentEntry_UID() 49int AbLabel::currentEntry_UID()
50{ 50{
51 Opie::OPimContact contact = currentEntry(); 51 Opie::OPimContact contact = currentEntry();
52 52
53 if ( contact.isEmpty() ) 53 if ( contact.isEmpty() )
54 return 0; 54 return 0;
55 else 55 else
56 return ( contact.uid() ); 56 return ( contact.uid() );
57} 57}
58 58
59Opie::OPimContact AbLabel::currentEntry() 59Opie::OPimContact AbLabel::currentEntry()
60{ 60{
61 if ( ! m_empty ) 61 if ( ! m_empty )
62 return ( *m_itCurContact ); 62 return ( *m_itCurContact );
63 else 63 else
64 return Opie::OPimContact(); 64 return Opie::OPimContact();
65} 65}
66 66
67 67
68bool AbLabel::selectContact( int UID ) 68bool AbLabel::selectContact( int UID )
69{ 69{
70 70
71 for ( int r = 0; r < m_viewList.count(); ++r ) { 71 for ( uint r = 0; r < m_viewList.count(); ++r ) {
72 if ( m_viewList.uidAt( r ) == UID ){ 72 if ( m_viewList.uidAt( r ) == UID ){
73 m_itCurContact.setCurrent( r ); 73 m_itCurContact.setCurrent( r );
74 break; 74 break;
75 } 75 }
76 } 76 }
77 77
78 sync(); 78 sync();
79 79
80 return true; 80 return true;
81} 81}
82 82
83 83
84 84
85void AbLabel::sync() 85void AbLabel::sync()
86{ 86{
87 QString text = (*m_itCurContact).toRichText(); 87 QString text = (*m_itCurContact).toRichText();
88 setText( text ); 88 setText( text );
89} 89}
90 90
91void AbLabel::keyPressEvent( QKeyEvent *e ) 91void AbLabel::keyPressEvent( QKeyEvent *e )
92{ 92{
93 93
94 // Commonly handled keys 94 // Commonly handled keys
95 if ( !m_empty ){ 95 if ( !m_empty ){
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 30d749c..0be7d1a 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -164,49 +164,48 @@ void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
164 //int row = 0; 164 //int row = 0;
165 // for ( it = m_viewList.begin(); it != m_viewList.end(); ++it ) 165 // for ( it = m_viewList.begin(); it != m_viewList.end(); ++it )
166 // insertIntoTable( *it, row++ ); 166 // insertIntoTable( *it, row++ );
167 167
168 // setSorting( true ); 168 // setSorting( true );
169 169
170 // resort(); 170 // resort();
171 171
172 updateVisible(); 172 updateVisible();
173 173
174 setPaintingEnabled( TRUE ); 174 setPaintingEnabled( TRUE );
175 175
176} 176}
177 177
178void AbTable::setOrderedList( const QValueList<int> ordered ) 178void AbTable::setOrderedList( const QValueList<int> ordered )
179{ 179{
180 intFields = ordered; 180 intFields = ordered;
181} 181}
182 182
183 183
184bool AbTable::selectContact( int UID ) 184bool AbTable::selectContact( int UID )
185{ 185{
186 odebug << "AbTable::selectContact( " << UID << " )" << oendl; 186 odebug << "AbTable::selectContact( " << UID << " )" << oendl;
187 int rows = numRows(); 187 int rows = numRows();
188 Opie::OPimContact* foundContact = 0l;
189 bool found = false; 188 bool found = false;
190 189
191 setPaintingEnabled( FALSE ); 190 setPaintingEnabled( FALSE );
192 odebug << "Search start" << oendl; 191 odebug << "Search start" << oendl;
193 for ( int r = 0; r < rows; ++r ) { 192 for ( int r = 0; r < rows; ++r ) {
194 if ( m_viewList.uidAt( r ) == UID ){ 193 if ( m_viewList.uidAt( r ) == UID ){
195 ensureCellVisible( r, 0 ); 194 ensureCellVisible( r, 0 );
196 setCurrentCell( r, 0 ); 195 setCurrentCell( r, 0 );
197 found = true; 196 found = true;
198 break; 197 break;
199 } 198 }
200 } 199 }
201 odebug << "Search end" << oendl; 200 odebug << "Search end" << oendl;
202 201
203 if ( !found ){ 202 if ( !found ){
204 ensureCellVisible( 0,0 ); 203 ensureCellVisible( 0,0 );
205 setCurrentCell( 0, 0 ); 204 setCurrentCell( 0, 0 );
206 } 205 }
207 206
208 setPaintingEnabled( TRUE ); 207 setPaintingEnabled( TRUE );
209 208
210 return true; 209 return true;
211} 210}
212 211
@@ -334,49 +333,49 @@ void AbTable::keyPressEvent( QKeyEvent *e )
334 if ( key >= 'A' && key <= 'Z' ) 333 if ( key >= 'A' && key <= 'Z' )
335 moveTo( key ); 334 moveTo( key );
336 335
337 // odebug << "Received key .." << oendl; 336 // odebug << "Received key .." << oendl;
338 switch( e->key() ) { 337 switch( e->key() ) {
339 case Qt::Key_Space: 338 case Qt::Key_Space:
340 case Qt::Key_Return: 339 case Qt::Key_Return:
341 case Qt::Key_Enter: 340 case Qt::Key_Enter:
342 emit signalSwitch(); 341 emit signalSwitch();
343 break; 342 break;
344 // case Qt::Key_Up: 343 // case Qt::Key_Up:
345 // odebug << "a" << oendl; 344 // odebug << "a" << oendl;
346 // emit signalKeyUp(); 345 // emit signalKeyUp();
347 // break; 346 // break;
348 // case Qt::Key_Down: 347 // case Qt::Key_Down:
349 // odebug << "b" << oendl; 348 // odebug << "b" << oendl;
350 // emit signalKeyDown(); 349 // emit signalKeyDown();
351 // break; 350 // break;
352 default: 351 default:
353 QTable::keyPressEvent( e ); 352 QTable::keyPressEvent( e );
354 } 353 }
355 354
356} 355}
357 356
358void AbTable::moveTo( char c ) 357void AbTable::moveTo( char /*c*/ )
359{ 358{
360 odebug << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl; 359 odebug << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl;
361 360
362#if 0 361#if 0
363 int rows = numRows(); 362 int rows = numRows();
364 QString value; 363 QString value;
365 AbTableItem *abi; 364 AbTableItem *abi;
366 int r; 365 int r;
367 if ( asc ) { 366 if ( asc ) {
368 r = 0; 367 r = 0;
369 while ( r < rows-1) { 368 while ( r < rows-1) {
370 abi = static_cast<AbTableItem*>( item(r, 0) ); 369 abi = static_cast<AbTableItem*>( item(r, 0) );
371 QChar first = abi->key()[0]; 370 QChar first = abi->key()[0];
372 //### is there a bug in QChar to char comparison??? 371 //### is there a bug in QChar to char comparison???
373 if ( first.row() || first.cell() >= c ) 372 if ( first.row() || first.cell() >= c )
374 break; 373 break;
375 r++; 374 r++;
376 } 375 }
377 } else { 376 } else {
378 //### should probably disable reverse sorting instead 377 //### should probably disable reverse sorting instead
379 r = rows - 1; 378 r = rows - 1;
380 while ( r > 0 ) { 379 while ( r > 0 ) {
381 abi = static_cast<AbTableItem*>( item(r, 0) ); 380 abi = static_cast<AbTableItem*>( item(r, 0) );
382 QChar first = abi->key()[0]; 381 QChar first = abi->key()[0];