author | alwin <alwin> | 2003-12-28 17:50:33 (UTC) |
---|---|---|
committer | alwin <alwin> | 2003-12-28 17:50:33 (UTC) |
commit | 0f6e3b4aa6faeb48df9e595fb2f50e78333d64d7 (patch) (unidiff) | |
tree | fee79098277e76942485646d766b21c93ccbc599 | |
parent | 696a2dcfcb65fbb24b709bbae0a18a7854e2d72c (diff) | |
download | opie-0f6e3b4aa6faeb48df9e595fb2f50e78333d64d7.zip opie-0f6e3b4aa6faeb48df9e595fb2f50e78333d64d7.tar.gz opie-0f6e3b4aa6faeb48df9e595fb2f50e78333d64d7.tar.bz2 |
fix for compiling with arm gcc 2.95.3 (next time I'll check before commit)
-rw-r--r-- | noncore/net/mail/accountview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp index f861c20..9f07f56 100644 --- a/noncore/net/mail/accountview.cpp +++ b/noncore/net/mail/accountview.cpp | |||
@@ -350,99 +350,101 @@ void IMAPfolderItem::deleteFolder() | |||
350 | QObject::tr("Yes",contextName), | 350 | QObject::tr("Yes",contextName), |
351 | QObject::tr("No",contextName),QString::null,1,1); | 351 | QObject::tr("No",contextName),QString::null,1,1); |
352 | qDebug("Auswahl: %i",yesno); | 352 | qDebug("Auswahl: %i",yesno); |
353 | if (yesno == 0) { | 353 | if (yesno == 0) { |
354 | if (imap->getWrapper()->deleteMbox(folder)) { | 354 | if (imap->getWrapper()->deleteMbox(folder)) { |
355 | QListView*v=listView(); | 355 | QListView*v=listView(); |
356 | IMAPviewItem * box = imap; | 356 | IMAPviewItem * box = imap; |
357 | /* be carefull - after that this object is destroyd so don't use | 357 | /* be carefull - after that this object is destroyd so don't use |
358 | * any member of it after that call!!*/ | 358 | * any member of it after that call!!*/ |
359 | imap->refreshFolders(true); | 359 | imap->refreshFolders(true); |
360 | if (v) { | 360 | if (v) { |
361 | v->setSelected(box,true); | 361 | v->setSelected(box,true); |
362 | } | 362 | } |
363 | } | 363 | } |
364 | } | 364 | } |
365 | } | 365 | } |
366 | 366 | ||
367 | void IMAPfolderItem::contextMenuSelected(int id) | 367 | void IMAPfolderItem::contextMenuSelected(int id) |
368 | { | 368 | { |
369 | qDebug("Selected id: %i",id); | 369 | qDebug("Selected id: %i",id); |
370 | AccountView * view = (AccountView*)listView(); | 370 | AccountView * view = (AccountView*)listView(); |
371 | switch(id) { | 371 | switch(id) { |
372 | case 0: | 372 | case 0: |
373 | view->refreshCurrent(); | 373 | view->refreshCurrent(); |
374 | break; | 374 | break; |
375 | case 1: | 375 | case 1: |
376 | deleteAllMail(imap->getWrapper(),folder); | 376 | deleteAllMail(imap->getWrapper(),folder); |
377 | break; | 377 | break; |
378 | case 2: | 378 | case 2: |
379 | createNewFolder(); | 379 | createNewFolder(); |
380 | break; | 380 | break; |
381 | case 3: | 381 | case 3: |
382 | deleteFolder(); | 382 | deleteFolder(); |
383 | break; | 383 | break; |
384 | default: | 384 | default: |
385 | break; | 385 | break; |
386 | } | 386 | } |
387 | } | 387 | } |
388 | 388 | ||
389 | /** | 389 | /** |
390 | * Generic stuff | 390 | * Generic stuff |
391 | */ | 391 | */ |
392 | 392 | ||
393 | const QString AccountViewItem::contextName="AccountViewItem"; | 393 | const QString AccountViewItem::contextName="AccountViewItem"; |
394 | 394 | ||
395 | void AccountViewItem::deleteAllMail(AbstractMail*wrapper,Folder*folder) | 395 | void AccountViewItem::deleteAllMail(AbstractMail*wrapper,Folder*folder) |
396 | { | 396 | { |
397 | if (!wrapper) return; | 397 | if (!wrapper) return; |
398 | QString fname=""; | ||
399 | if (folder) fname = folder->getDisplayName(); | ||
398 | int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName), | 400 | int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName), |
399 | QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName). | 401 | QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName). |
400 | arg((folder?folder->getDisplayName():"")), | 402 | arg(fname), |
401 | QObject::tr("Yes",contextName), | 403 | QObject::tr("Yes",contextName), |
402 | QObject::tr("No",contextName),QString::null,1,1); | 404 | QObject::tr("No",contextName),QString::null,1,1); |
403 | qDebug("Auswahl: %i",yesno); | 405 | qDebug("Auswahl: %i",yesno); |
404 | if (yesno == 0) { | 406 | if (yesno == 0) { |
405 | if (wrapper->deleteAllMail(folder)) { | 407 | if (wrapper->deleteAllMail(folder)) { |
406 | AccountView * view = (AccountView*)listView(); | 408 | AccountView * view = (AccountView*)listView(); |
407 | if (view) view->refreshCurrent(); | 409 | if (view) view->refreshCurrent(); |
408 | } | 410 | } |
409 | } | 411 | } |
410 | } | 412 | } |
411 | 413 | ||
412 | AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) | 414 | AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) |
413 | : QListView( parent, name, flags ) | 415 | : QListView( parent, name, flags ) |
414 | { | 416 | { |
415 | connect( this, SIGNAL( selectionChanged( QListViewItem * ) ), | 417 | connect( this, SIGNAL( selectionChanged( QListViewItem * ) ), |
416 | SLOT( refresh( QListViewItem * ) ) ); | 418 | SLOT( refresh( QListViewItem * ) ) ); |
417 | connect( this, SIGNAL( mouseButtonPressed(int, QListViewItem *,const QPoint&,int ) ),this, | 419 | connect( this, SIGNAL( mouseButtonPressed(int, QListViewItem *,const QPoint&,int ) ),this, |
418 | SLOT( slotHold( int, QListViewItem *,const QPoint&,int ) ) ); | 420 | SLOT( slotHold( int, QListViewItem *,const QPoint&,int ) ) ); |
419 | 421 | ||
420 | setSorting(0); | 422 | setSorting(0); |
421 | } | 423 | } |
422 | 424 | ||
423 | void AccountView::slotContextMenu(int id) | 425 | void AccountView::slotContextMenu(int id) |
424 | { | 426 | { |
425 | AccountViewItem *view = static_cast<AccountViewItem *>(currentItem()); | 427 | AccountViewItem *view = static_cast<AccountViewItem *>(currentItem()); |
426 | if (!view) return; | 428 | if (!view) return; |
427 | view->contextMenuSelected(id); | 429 | view->contextMenuSelected(id); |
428 | } | 430 | } |
429 | 431 | ||
430 | void AccountView::slotHold(int button, QListViewItem * item,const QPoint&,int) | 432 | void AccountView::slotHold(int button, QListViewItem * item,const QPoint&,int) |
431 | { | 433 | { |
432 | if (button==1) {return;} | 434 | if (button==1) {return;} |
433 | if (!item) return; | 435 | if (!item) return; |
434 | AccountViewItem *view = static_cast<AccountViewItem *>(item); | 436 | AccountViewItem *view = static_cast<AccountViewItem *>(item); |
435 | QPopupMenu*m = view->getContextMenu(); | 437 | QPopupMenu*m = view->getContextMenu(); |
436 | if (!m) return; | 438 | if (!m) return; |
437 | connect(m,SIGNAL(activated(int)),this,SLOT(slotContextMenu(int))); | 439 | connect(m,SIGNAL(activated(int)),this,SLOT(slotContextMenu(int))); |
438 | m->setFocus(); | 440 | m->setFocus(); |
439 | m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) ); | 441 | m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) ); |
440 | delete m; | 442 | delete m; |
441 | } | 443 | } |
442 | 444 | ||
443 | void AccountView::populate( QList<Account> list ) | 445 | void AccountView::populate( QList<Account> list ) |
444 | { | 446 | { |
445 | clear(); | 447 | clear(); |
446 | 448 | ||
447 | QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/"); | 449 | QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/"); |
448 | (void) new MBOXviewItem(localfolders,this); | 450 | (void) new MBOXviewItem(localfolders,this); |