summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/oversatileview.cpp152
-rw-r--r--libopie2/opieui/oversatileviewitem.cpp2
2 files changed, 77 insertions, 77 deletions
diff --git a/libopie2/opieui/oversatileview.cpp b/libopie2/opieui/oversatileview.cpp
index 32855be..6808539 100644
--- a/libopie2/opieui/oversatileview.cpp
+++ b/libopie2/opieui/oversatileview.cpp
@@ -248,25 +248,25 @@ void OVersatileView::contextMenuRequested( QListViewItem* item, const QPoint& po
248 // disciplined enough to only add OVersatileViewItems to an OVersatileView 248 // disciplined enough to only add OVersatileViewItems to an OVersatileView
249 popupContextMenu( static_cast<OVersatileViewItem*>( item ), pos, col ); 249 popupContextMenu( static_cast<OVersatileViewItem*>( item ), pos, col );
250} 250}
251 251
252void OVersatileView::contextMenuRequested( QIconViewItem* item, const QPoint& pos ) 252void OVersatileView::contextMenuRequested( QIconViewItem* item, const QPoint& pos )
253{ 253{
254 // see above 254 // see above
255 popupContextMenu( static_cast<OVersatileViewItem*>( item ), pos, -1 ); 255 popupContextMenu( static_cast<OVersatileViewItem*>( item ), pos, -1 );
256} 256}
257 257
258void OVersatileView::popupContextMenu( OVersatileViewItem* item, const QPoint& pos, int col ) 258void OVersatileView::popupContextMenu( OVersatileViewItem* item, const QPoint& pos, int col )
259{ 259{
260 if ( not item ) 260 if ( !item )
261 _contextmenu->exec( pos ); 261 _contextmenu->exec( pos );
262 else 262 else
263 emit( contextMenuRequested( item, pos, col ) ); 263 emit( contextMenuRequested( item, pos, col ) );
264} 264}
265 265
266void OVersatileView::setSynchronization( bool sync ) 266void OVersatileView::setSynchronization( bool sync )
267{ 267{
268 _synchronization = sync; 268 _synchronization = sync;
269} 269}
270 270
271bool OVersatileView::synchronization() 271bool OVersatileView::synchronization()
272{ 272{
@@ -440,646 +440,646 @@ void OVersatileView::onItem( QListViewItem * item )
440{ 440{
441 emit( onItem( static_cast<OVersatileViewItem*>( item ) ) ); 441 emit( onItem( static_cast<OVersatileViewItem*>( item ) ) );
442} 442}
443 443
444void OVersatileView::onItem( QIconViewItem * item ) 444void OVersatileView::onItem( QIconViewItem * item )
445{ 445{
446 emit( onItem( static_cast<OVersatileViewItem*>( item ) ) ); 446 emit( onItem( static_cast<OVersatileViewItem*>( item ) ) );
447} 447}
448 448
449void OVersatileView::expanded( QListViewItem *item ) // QListView 449void OVersatileView::expanded( QListViewItem *item ) // QListView
450{ 450{
451 //qDebug( "OVersatileView::expanded(): opening tree..." ); 451 //qDebug( "OVersatileView::expanded(): opening tree..." );
452 if ( not _treeopened.isNull() ) 452 if ( !_treeopened.isNull() )
453 item->setPixmap( 0, _treeopened ); 453 item->setPixmap( 0, _treeopened );
454 emit( expanded( static_cast<OVersatileViewItem*>( item ) ) ); 454 emit( expanded( static_cast<OVersatileViewItem*>( item ) ) );
455} 455}
456void OVersatileView::collapsed( QListViewItem *item ) // QListView 456void OVersatileView::collapsed( QListViewItem *item ) // QListView
457{ 457{
458 if ( not _treeclosed.isNull() ) 458 if ( !_treeclosed.isNull() )
459 item->setPixmap( 0, _treeclosed ); 459 item->setPixmap( 0, _treeclosed );
460 emit( collapsed( static_cast<OVersatileViewItem*>( item ) ) ); 460 emit( collapsed( static_cast<OVersatileViewItem*>( item ) ) );
461} 461}
462 462
463//=============================================================================================// 463//=============================================================================================//
464// OVersatileView Case I - API only existing in QListView or QIconView but not in both! 464// OVersatileView Case I - API only existing in QListView or QIconView but not in both!
465//==============================================================================================// 465//==============================================================================================//
466 466
467int OVersatileView::treeStepSize() const // QListView 467int OVersatileView::treeStepSize() const // QListView
468{ 468{
469 if ( not isValidViewMode( Tree ) ) 469 if ( !isValidViewMode( Tree ) )
470 { 470 {
471 return -1; 471 return -1;
472 } 472 }
473 return _listview->treeStepSize(); 473 return _listview->treeStepSize();
474} 474}
475 void OVersatileView::setTreeStepSize( int size ) // QListView 475 void OVersatileView::setTreeStepSize( int size ) // QListView
476{ 476{
477 if ( not isValidViewMode( Tree ) ) 477 if ( !isValidViewMode( Tree ) )
478 { 478 {
479 return; 479 return;
480 } 480 }
481 _listview->setTreeStepSize( size ); 481 _listview->setTreeStepSize( size );
482} 482}
483 483
484QHeader * OVersatileView::header() const // QListView 484QHeader * OVersatileView::header() const // QListView
485{ 485{
486 if ( not isValidViewMode( Tree ) ) 486 if ( !isValidViewMode( Tree ) )
487 { 487 {
488 return 0; 488 return 0;
489 } 489 }
490 return _listview->header(); 490 return _listview->header();
491} 491}
492 492
493 int OVersatileView::addColumn( const QString &label, int size ) // QListView 493 int OVersatileView::addColumn( const QString &label, int size ) // QListView
494{ 494{
495 if ( not isValidViewMode( Tree ) ) 495 if ( !isValidViewMode( Tree ) )
496 { 496 {
497 return -1; 497 return -1;
498 } 498 }
499 return _listview->addColumn( label, size ); 499 return _listview->addColumn( label, size );
500} 500}
501 501
502 int OVersatileView::addColumn( const QIconSet& iconset, const QString &label, int size ) // QListView 502 int OVersatileView::addColumn( const QIconSet& iconset, const QString &label, int size ) // QListView
503{ 503{
504 if ( not isValidViewMode( Tree ) ) 504 if ( !isValidViewMode( Tree ) )
505 { 505 {
506 return -1; 506 return -1;
507 } 507 }
508 return _listview->addColumn( iconset, label, size ); 508 return _listview->addColumn( iconset, label, size );
509} 509}
510 510
511void OVersatileView::removeColumn( int index ) // QListView 511void OVersatileView::removeColumn( int index ) // QListView
512{ 512{
513 if ( not isValidViewMode( Tree ) ) 513 if ( !isValidViewMode( Tree ) )
514 { 514 {
515 return; 515 return;
516 } 516 }
517 _listview->removeColumn( index ); 517 _listview->removeColumn( index );
518} 518}
519 void OVersatileView::setColumnText( int column, const QString &label ) // QListView 519 void OVersatileView::setColumnText( int column, const QString &label ) // QListView
520{ 520{
521 if ( not isValidViewMode( Tree ) ) 521 if ( !isValidViewMode( Tree ) )
522 { 522 {
523 return; 523 return;
524 } 524 }
525 _listview->setColumnText( column, label ); 525 _listview->setColumnText( column, label );
526} 526}
527 void OVersatileView::setColumnText( int column, const QIconSet& iconset, const QString &label ) // QListView 527 void OVersatileView::setColumnText( int column, const QIconSet& iconset, const QString &label ) // QListView
528{ 528{
529 if ( not isValidViewMode( Tree ) ) 529 if ( !isValidViewMode( Tree ) )
530 { 530 {
531 return; 531 return;
532 } 532 }
533 _listview->setColumnText( column, iconset, label ); 533 _listview->setColumnText( column, iconset, label );
534} 534}
535QString OVersatileView::columnText( int column ) const // QListView 535QString OVersatileView::columnText( int column ) const // QListView
536{ 536{
537 if ( not isValidViewMode( Tree ) ) 537 if ( !isValidViewMode( Tree ) )
538 { 538 {
539 return QString::null; 539 return QString::null;
540 } 540 }
541 return _listview->columnText( column ); 541 return _listview->columnText( column );
542} 542}
543 void OVersatileView::setColumnWidth( int column, int width ) // QListView 543 void OVersatileView::setColumnWidth( int column, int width ) // QListView
544{ 544{
545 if ( not isValidViewMode( Tree ) ) 545 if ( !isValidViewMode( Tree ) )
546 { 546 {
547 return; 547 return;
548 } 548 }
549 _listview->setColumnWidth( column, width ); 549 _listview->setColumnWidth( column, width );
550} 550}
551int OVersatileView::columnWidth( int column ) const // QListView 551int OVersatileView::columnWidth( int column ) const // QListView
552{ 552{
553 if ( not isValidViewMode( Tree ) ) 553 if ( !isValidViewMode( Tree ) )
554 { 554 {
555 return -1; 555 return -1;
556 } 556 }
557 return _listview->columnWidth( column ); 557 return _listview->columnWidth( column );
558} 558}
559 void OVersatileView::setColumnWidthMode( int column, WidthMode mode ) // QListView 559 void OVersatileView::setColumnWidthMode( int column, WidthMode mode ) // QListView
560{ 560{
561 if ( not isValidViewMode( Tree ) ) 561 if ( !isValidViewMode( Tree ) )
562 { 562 {
563 return; 563 return;
564 } 564 }
565 _listview->setColumnWidth( column, mode ); 565 _listview->setColumnWidth( column, mode );
566} 566}
567int OVersatileView::columns() const // QListView 567int OVersatileView::columns() const // QListView
568{ 568{
569 if ( not isValidViewMode( Tree ) ) 569 if ( !isValidViewMode( Tree ) )
570 { 570 {
571 return -1; 571 return -1;
572 } 572 }
573 return _listview->columns(); 573 return _listview->columns();
574} 574}
575 575
576 void OVersatileView::setColumnAlignment( int column, int align ) // QListView 576 void OVersatileView::setColumnAlignment( int column, int align ) // QListView
577{ 577{
578 if ( not isValidViewMode( Tree ) ) 578 if ( !isValidViewMode( Tree ) )
579 { 579 {
580 return; 580 return;
581 } 581 }
582 _listview->setColumnAlignment( column, align ); 582 _listview->setColumnAlignment( column, align );
583} 583}
584int OVersatileView::columnAlignment( int column ) const // QListView 584int OVersatileView::columnAlignment( int column ) const // QListView
585{ 585{
586 if ( not isValidViewMode( Tree ) ) 586 if ( !isValidViewMode( Tree ) )
587 { 587 {
588 return -1; 588 return -1;
589 } 589 }
590 return _listview->columnAlignment( column ); 590 return _listview->columnAlignment( column );
591} 591}
592 592
593OVersatileViewItem * OVersatileView::itemAt( const QPoint & screenPos ) const // QListView 593OVersatileViewItem * OVersatileView::itemAt( const QPoint & screenPos ) const // QListView
594{ 594{
595 if ( not isValidViewMode( Tree ) ) 595 if ( !isValidViewMode( Tree ) )
596 { 596 {
597 return 0; 597 return 0;
598 } 598 }
599 return static_cast<OVersatileViewItem*>( _listview->itemAt( screenPos ) ); 599 return static_cast<OVersatileViewItem*>( _listview->itemAt( screenPos ) );
600} 600}
601QRect OVersatileView::itemRect( const OVersatileViewItem * item ) const // QListView 601QRect OVersatileView::itemRect( const OVersatileViewItem * item ) const // QListView
602{ 602{
603 if ( not isValidViewMode( Tree ) ) 603 if ( !isValidViewMode( Tree ) )
604 { 604 {
605 return QRect( -1, -1, -1, -1 ); 605 return QRect( -1, -1, -1, -1 );
606 } 606 }
607 return _listview->itemRect( item ); 607 return _listview->itemRect( item );
608} 608}
609int OVersatileView::itemPos( const OVersatileViewItem * item ) // QListView 609int OVersatileView::itemPos( const OVersatileViewItem * item ) // QListView
610{ 610{
611 if ( not isValidViewMode( Tree ) ) 611 if ( !isValidViewMode( Tree ) )
612 { 612 {
613 return -1; 613 return -1;
614 } 614 }
615 return _listview->itemPos( item ); 615 return _listview->itemPos( item );
616} 616}
617 617
618bool OVersatileView::isSelected( const OVersatileViewItem * item ) const // QListView // also in QIconViewItem but !in QIconView *shrug* 618bool OVersatileView::isSelected( const OVersatileViewItem * item ) const // QListView // also in QIconViewItem but !in QIconView *shrug*
619{ 619{
620 if ( not isValidViewMode( Tree ) ) 620 if ( !isValidViewMode( Tree ) )
621 { 621 {
622 return false; 622 return false;
623 } 623 }
624 return _listview->isSelected( item ); 624 return _listview->isSelected( item );
625} 625}
626 626
627 void OVersatileView::setMultiSelection( bool enable ) 627 void OVersatileView::setMultiSelection( bool enable )
628{ 628{
629 _listview->setMultiSelection( enable ); 629 _listview->setMultiSelection( enable );
630} 630}
631bool OVersatileView::isMultiSelection() const 631bool OVersatileView::isMultiSelection() const
632{ 632{
633 return _listview->isMultiSelection(); 633 return _listview->isMultiSelection();
634} 634}
635 635
636OVersatileViewItem * OVersatileView::selectedItem() const // QListView 636OVersatileViewItem * OVersatileView::selectedItem() const // QListView
637{ 637{
638 if ( not isValidViewMode( Tree ) ) 638 if ( !isValidViewMode( Tree ) )
639 { 639 {
640 return 0; 640 return 0;
641 } 641 }
642 return static_cast<OVersatileViewItem*>( _listview->selectedItem() ); 642 return static_cast<OVersatileViewItem*>( _listview->selectedItem() );
643} 643}
644 void OVersatileView::setOpen( OVersatileViewItem * item, bool open ) // QListView 644 void OVersatileView::setOpen( OVersatileViewItem * item, bool open ) // QListView
645{ 645{
646 if ( not isValidViewMode( Tree ) ) 646 if ( !isValidViewMode( Tree ) )
647 { 647 {
648 return; 648 return;
649 } 649 }
650 _listview->setOpen( item, open ); 650 _listview->setOpen( item, open );
651} 651}
652bool OVersatileView::isOpen( const OVersatileViewItem * item ) const // QListView 652bool OVersatileView::isOpen( const OVersatileViewItem * item ) const // QListView
653{ 653{
654 if ( not isValidViewMode( Tree ) ) 654 if ( !isValidViewMode( Tree ) )
655 { 655 {
656 return false; 656 return false;
657 } 657 }
658 return _listview->isOpen( item ); 658 return _listview->isOpen( item );
659} 659}
660 660
661OVersatileViewItem * OVersatileView::firstChild() const // QListView 661OVersatileViewItem * OVersatileView::firstChild() const // QListView
662{ 662{
663 if ( not isValidViewMode( Tree ) ) 663 if ( !isValidViewMode( Tree ) )
664 { 664 {
665 return 0; 665 return 0;
666 } 666 }
667 return static_cast<OVersatileViewItem*>( _listview->firstChild() ); 667 return static_cast<OVersatileViewItem*>( _listview->firstChild() );
668} 668}
669int OVersatileView::childCount() const // QListView 669int OVersatileView::childCount() const // QListView
670{ 670{
671 if ( not isValidViewMode( Tree ) ) 671 if ( !isValidViewMode( Tree ) )
672 { 672 {
673 return -1; 673 return -1;
674 } 674 }
675 return _listview->childCount(); 675 return _listview->childCount();
676} 676}
677 677
678 void OVersatileView::setAllColumnsShowFocus( bool focus ) // QListView 678 void OVersatileView::setAllColumnsShowFocus( bool focus ) // QListView
679{ 679{
680 if ( not isValidViewMode( Tree ) ) 680 if ( !isValidViewMode( Tree ) )
681 { 681 {
682 return; 682 return;
683 } 683 }
684 _listview->setAllColumnsShowFocus( focus ); 684 _listview->setAllColumnsShowFocus( focus );
685} 685}
686bool OVersatileView::allColumnsShowFocus() const // QListView 686bool OVersatileView::allColumnsShowFocus() const // QListView
687{ 687{
688 if ( not isValidViewMode( Tree ) ) 688 if ( !isValidViewMode( Tree ) )
689 { 689 {
690 return false; 690 return false;
691 } 691 }
692 return _listview->allColumnsShowFocus(); 692 return _listview->allColumnsShowFocus();
693} 693}
694 694
695 void OVersatileView::setItemMargin( int margin ) // QListView 695 void OVersatileView::setItemMargin( int margin ) // QListView
696{ 696{
697 if ( not isValidViewMode( Tree ) ) 697 if ( !isValidViewMode( Tree ) )
698 { 698 {
699 return; 699 return;
700 } 700 }
701 _listview->setItemMargin( margin ); 701 _listview->setItemMargin( margin );
702} 702}
703int OVersatileView::itemMargin() const // QListView 703int OVersatileView::itemMargin() const // QListView
704{ 704{
705 if ( not isValidViewMode( Tree ) ) 705 if ( !isValidViewMode( Tree ) )
706 { 706 {
707 return -1; 707 return -1;
708 } 708 }
709 return _listview->itemMargin(); 709 return _listview->itemMargin();
710} 710}
711 711
712 void OVersatileView::setRootIsDecorated( bool decorate ) // QListView 712 void OVersatileView::setRootIsDecorated( bool decorate ) // QListView
713{ 713{
714 if ( not isValidViewMode( Tree ) ) 714 if ( !isValidViewMode( Tree ) )
715 { 715 {
716 return; 716 return;
717 } 717 }
718 _listview->setRootIsDecorated( decorate ); 718 _listview->setRootIsDecorated( decorate );
719} 719}
720bool OVersatileView::rootIsDecorated() const // QListView 720bool OVersatileView::rootIsDecorated() const // QListView
721{ 721{
722 if ( not isValidViewMode( Tree ) ) 722 if ( !isValidViewMode( Tree ) )
723 { 723 {
724 return false; 724 return false;
725 } 725 }
726 return _listview->rootIsDecorated(); 726 return _listview->rootIsDecorated();
727} 727}
728 728
729void OVersatileView::setShowSortIndicator( bool show ) // QListView 729void OVersatileView::setShowSortIndicator( bool show ) // QListView
730{ 730{
731 if ( not isValidViewMode( Tree ) ) 731 if ( !isValidViewMode( Tree ) )
732 { 732 {
733 return; 733 return;
734 } 734 }
735 _listview->setShowSortIndicator( show ); 735 _listview->setShowSortIndicator( show );
736} 736}
737bool OVersatileView::showSortIndicator() const // QListView 737bool OVersatileView::showSortIndicator() const // QListView
738{ 738{
739 if ( not isValidViewMode( Tree ) ) 739 if ( !isValidViewMode( Tree ) )
740 { 740 {
741 return false; 741 return false;
742 } 742 }
743 return _listview->showSortIndicator(); 743 return _listview->showSortIndicator();
744} 744}
745 745
746void OVersatileView::triggerUpdate() // QListView 746void OVersatileView::triggerUpdate() // QListView
747{ 747{
748 if ( not isValidViewMode( Tree ) ) 748 if ( !isValidViewMode( Tree ) )
749 { 749 {
750 return; 750 return;
751 } 751 }
752 _listview->triggerUpdate(); 752 _listview->triggerUpdate();
753} 753}
754 754
755// 755//
756// only in QIconView 756// only in QIconView
757// 757//
758 758
759uint OVersatileView::count() const // QIconView 759uint OVersatileView::count() const // QIconView
760{ 760{
761 if ( not isValidViewMode( Icons ) ) 761 if ( !isValidViewMode( Icons ) )
762 { 762 {
763 return 0; 763 return 0;
764 } 764 }
765 return _iconview->count(); 765 return _iconview->count();
766} 766}
767 767
768int OVersatileView::index( const OVersatileViewItem *item ) const // QIconView 768int OVersatileView::index( const OVersatileViewItem *item ) const // QIconView
769{ 769{
770 if ( not isValidViewMode( Icons ) ) 770 if ( !isValidViewMode( Icons ) )
771 { 771 {
772 return -1; 772 return -1;
773 } 773 }
774 return _iconview->index( item ); 774 return _iconview->index( item );
775} 775}
776 776
777OVersatileViewItem* OVersatileView::firstItem() const // QIconView 777OVersatileViewItem* OVersatileView::firstItem() const // QIconView
778{ 778{
779 if ( not isValidViewMode( Icons ) ) 779 if ( !isValidViewMode( Icons ) )
780 { 780 {
781 return 0; 781 return 0;
782 } 782 }
783 return static_cast<OVersatileViewItem*>( _iconview->firstItem() ); 783 return static_cast<OVersatileViewItem*>( _iconview->firstItem() );
784} 784}
785OVersatileViewItem* OVersatileView::lastItem() const // QIconView 785OVersatileViewItem* OVersatileView::lastItem() const // QIconView
786{ 786{
787 if ( not isValidViewMode( Icons ) ) 787 if ( !isValidViewMode( Icons ) )
788 { 788 {
789 return 0; 789 return 0;
790 } 790 }
791 return static_cast<OVersatileViewItem*>( _iconview->lastItem() ); 791 return static_cast<OVersatileViewItem*>( _iconview->lastItem() );
792} 792}
793 793
794OVersatileViewItem* OVersatileView::findItem( const QPoint &pos ) const // QIconView 794OVersatileViewItem* OVersatileView::findItem( const QPoint &pos ) const // QIconView
795{ 795{
796 if ( not isValidViewMode( Icons ) ) 796 if ( !isValidViewMode( Icons ) )
797 { 797 {
798 return 0; 798 return 0;
799 } 799 }
800 return static_cast<OVersatileViewItem*>( _iconview->findItem( pos ) ); 800 return static_cast<OVersatileViewItem*>( _iconview->findItem( pos ) );
801} 801}
802OVersatileViewItem* OVersatileView::findItem( const QString &text ) const // QIconView 802OVersatileViewItem* OVersatileView::findItem( const QString &text ) const // QIconView
803{ 803{
804 if ( not isValidViewMode( Icons ) ) 804 if ( !isValidViewMode( Icons ) )
805 { 805 {
806 return 0; 806 return 0;
807 } 807 }
808 return static_cast<OVersatileViewItem*>( _iconview->findItem( text ) ); 808 return static_cast<OVersatileViewItem*>( _iconview->findItem( text ) );
809} 809}
810 810
811OVersatileViewItem* OVersatileView::findFirstVisibleItem( const QRect &r ) const // QIconView 811OVersatileViewItem* OVersatileView::findFirstVisibleItem( const QRect &r ) const // QIconView
812{ 812{
813 if ( not isValidViewMode( Icons ) ) 813 if ( !isValidViewMode( Icons ) )
814 { 814 {
815 return 0; 815 return 0;
816 } 816 }
817 return static_cast<OVersatileViewItem*>( _iconview->findFirstVisibleItem( r ) ); 817 return static_cast<OVersatileViewItem*>( _iconview->findFirstVisibleItem( r ) );
818} 818}
819OVersatileViewItem* OVersatileView::findLastVisibleItem( const QRect &r ) const // QIconView 819OVersatileViewItem* OVersatileView::findLastVisibleItem( const QRect &r ) const // QIconView
820{ 820{
821 if ( not isValidViewMode( Icons ) ) 821 if ( !isValidViewMode( Icons ) )
822 { 822 {
823 return 0; 823 return 0;
824 } 824 }
825 return static_cast<OVersatileViewItem*>( _iconview->findLastVisibleItem( r ) ); 825 return static_cast<OVersatileViewItem*>( _iconview->findLastVisibleItem( r ) );
826} 826}
827 827
828 void OVersatileView::setGridX( int rx ) // QIconView 828 void OVersatileView::setGridX( int rx ) // QIconView
829{ 829{
830 if ( not isValidViewMode( Icons ) ) 830 if ( !isValidViewMode( Icons ) )
831 { 831 {
832 return; 832 return;
833 } 833 }
834 _iconview->setGridX( rx ); 834 _iconview->setGridX( rx );
835} 835}
836 void OVersatileView::setGridY( int ry ) // QIconView 836 void OVersatileView::setGridY( int ry ) // QIconView
837{ 837{
838 if ( not isValidViewMode( Icons ) ) 838 if ( !isValidViewMode( Icons ) )
839 { 839 {
840 return; 840 return;
841 } 841 }
842 _iconview->setGridY( ry ); 842 _iconview->setGridY( ry );
843} 843}
844int OVersatileView::gridX() const // QIconView 844int OVersatileView::gridX() const // QIconView
845{ 845{
846 if ( not isValidViewMode( Icons ) ) 846 if ( !isValidViewMode( Icons ) )
847 { 847 {
848 return -1; 848 return -1;
849 } 849 }
850 return _iconview->gridX(); 850 return _iconview->gridX();
851} 851}
852int OVersatileView::gridY() const // QIconView 852int OVersatileView::gridY() const // QIconView
853{ 853{
854 if ( not isValidViewMode( Icons ) ) 854 if ( !isValidViewMode( Icons ) )
855 { 855 {
856 return -1; 856 return -1;
857 } 857 }
858 return _iconview->gridY(); 858 return _iconview->gridY();
859} 859}
860 void OVersatileView::setSpacing( int sp ) // QIconView 860 void OVersatileView::setSpacing( int sp ) // QIconView
861{ 861{
862 if ( not isValidViewMode( Icons ) ) 862 if ( !isValidViewMode( Icons ) )
863 { 863 {
864 return; 864 return;
865 } 865 }
866 _iconview->setSpacing( sp ); 866 _iconview->setSpacing( sp );
867} 867}
868int OVersatileView::spacing() const // QIconView 868int OVersatileView::spacing() const // QIconView
869{ 869{
870 if ( not isValidViewMode( Icons ) ) 870 if ( !isValidViewMode( Icons ) )
871 { 871 {
872 return -1; 872 return -1;
873 } 873 }
874 return _iconview->spacing(); 874 return _iconview->spacing();
875} 875}
876 void OVersatileView::setItemTextPos( QIconView::ItemTextPos pos ) // QIconView 876 void OVersatileView::setItemTextPos( QIconView::ItemTextPos pos ) // QIconView
877{ 877{
878 if ( not isValidViewMode( Icons ) ) 878 if ( !isValidViewMode( Icons ) )
879 { 879 {
880 return; 880 return;
881 } 881 }
882 _iconview->setItemTextPos( pos ); 882 _iconview->setItemTextPos( pos );
883} 883}
884QIconView::ItemTextPos OVersatileView::itemTextPos() const // QIconView 884QIconView::ItemTextPos OVersatileView::itemTextPos() const // QIconView
885{ 885{
886 if ( not isValidViewMode( Icons ) ) 886 if ( !isValidViewMode( Icons ) )
887 { 887 {
888 return (QIconView::ItemTextPos) -1; 888 return (QIconView::ItemTextPos) -1;
889 } 889 }
890 return _iconview->itemTextPos(); 890 return _iconview->itemTextPos();
891} 891}
892 void OVersatileView::setItemTextBackground( const QBrush &b ) // QIconView 892 void OVersatileView::setItemTextBackground( const QBrush &b ) // QIconView
893{ 893{
894 if ( not isValidViewMode( Icons ) ) 894 if ( !isValidViewMode( Icons ) )
895 { 895 {
896 return; 896 return;
897 } 897 }
898 _iconview->setItemTextBackground( b ); 898 _iconview->setItemTextBackground( b );
899} 899}
900QBrush OVersatileView::itemTextBackground() const // QIconView 900QBrush OVersatileView::itemTextBackground() const // QIconView
901{ 901{
902 if ( not isValidViewMode( Icons ) ) 902 if ( !isValidViewMode( Icons ) )
903 { 903 {
904 return QBrush(); 904 return QBrush();
905 } 905 }
906 return _iconview->itemTextBackground(); 906 return _iconview->itemTextBackground();
907} 907}
908 void OVersatileView::setArrangement( QIconView::Arrangement am ) // QIconView 908 void OVersatileView::setArrangement( QIconView::Arrangement am ) // QIconView
909{ 909{
910 if ( not isValidViewMode( Icons ) ) 910 if ( !isValidViewMode( Icons ) )
911 { 911 {
912 return; 912 return;
913 } 913 }
914 _iconview->setArrangement( am ); 914 _iconview->setArrangement( am );
915} 915}
916QIconView::Arrangement OVersatileView::arrangement() const // QIconView 916QIconView::Arrangement OVersatileView::arrangement() const // QIconView
917{ 917{
918 if ( not isValidViewMode( Icons ) ) 918 if ( !isValidViewMode( Icons ) )
919 { 919 {
920 return (QIconView::Arrangement) -1; 920 return (QIconView::Arrangement) -1;
921 } 921 }
922 return _iconview->arrangement(); 922 return _iconview->arrangement();
923} 923}
924 void OVersatileView::setResizeMode( QIconView::ResizeMode am ) // QIconView 924 void OVersatileView::setResizeMode( QIconView::ResizeMode am ) // QIconView
925{ 925{
926 if ( not isValidViewMode( Icons ) ) 926 if ( !isValidViewMode( Icons ) )
927 { 927 {
928 return; 928 return;
929 } 929 }
930 _iconview->setResizeMode( am ); 930 _iconview->setResizeMode( am );
931} 931}
932QIconView::ResizeMode OVersatileView::resizeMode() const // QIconView 932QIconView::ResizeMode OVersatileView::resizeMode() const // QIconView
933{ 933{
934 if ( not isValidViewMode( Icons ) ) 934 if ( !isValidViewMode( Icons ) )
935 { 935 {
936 return (QIconView::ResizeMode) -1; 936 return (QIconView::ResizeMode) -1;
937 } 937 }
938 return _iconview->resizeMode(); 938 return _iconview->resizeMode();
939} 939}
940 void OVersatileView::setMaxItemWidth( int w ) // QIconView 940 void OVersatileView::setMaxItemWidth( int w ) // QIconView
941{ 941{
942 if ( not isValidViewMode( Icons ) ) 942 if ( !isValidViewMode( Icons ) )
943 { 943 {
944 return; 944 return;
945 } 945 }
946 _iconview->setMaxItemWidth( w ); 946 _iconview->setMaxItemWidth( w );
947} 947}
948int OVersatileView::maxItemWidth() const // QIconView 948int OVersatileView::maxItemWidth() const // QIconView
949{ 949{
950 if ( not isValidViewMode( Icons ) ) 950 if ( !isValidViewMode( Icons ) )
951 { 951 {
952 return -1; 952 return -1;
953 } 953 }
954 return _iconview->maxItemWidth(); 954 return _iconview->maxItemWidth();
955} 955}
956 void OVersatileView::setMaxItemTextLength( int w ) // QIconView 956 void OVersatileView::setMaxItemTextLength( int w ) // QIconView
957{ 957{
958 if ( not isValidViewMode( Icons ) ) 958 if ( !isValidViewMode( Icons ) )
959 { 959 {
960 return; 960 return;
961 } 961 }
962 _iconview->setMaxItemTextLength( w ); 962 _iconview->setMaxItemTextLength( w );
963} 963}
964int OVersatileView::maxItemTextLength() const // QIconView 964int OVersatileView::maxItemTextLength() const // QIconView
965{ 965{
966 if ( not isValidViewMode( Icons ) ) 966 if ( !isValidViewMode( Icons ) )
967 { 967 {
968 return -1; 968 return -1;
969 } 969 }
970 return _iconview->maxItemTextLength(); 970 return _iconview->maxItemTextLength();
971} 971}
972 void OVersatileView::setAutoArrange( bool b ) // QIconView 972 void OVersatileView::setAutoArrange( bool b ) // QIconView
973{ 973{
974 if ( not isValidViewMode( Icons ) ) 974 if ( !isValidViewMode( Icons ) )
975 { 975 {
976 return; 976 return;
977 } 977 }
978 _iconview->setAutoArrange( b ); 978 _iconview->setAutoArrange( b );
979} 979}
980bool OVersatileView::autoArrange() const // QIconView 980bool OVersatileView::autoArrange() const // QIconView
981{ 981{
982 if ( not isValidViewMode( Icons ) ) 982 if ( !isValidViewMode( Icons ) )
983 { 983 {
984 return false; 984 return false;
985 } 985 }
986 return _iconview->autoArrange(); 986 return _iconview->autoArrange();
987} 987}
988 void OVersatileView::setShowToolTips( bool b ) // QIconView 988 void OVersatileView::setShowToolTips( bool b ) // QIconView
989{ 989{
990 if ( not isValidViewMode( Icons ) ) 990 if ( !isValidViewMode( Icons ) )
991 { 991 {
992 return; 992 return;
993 } 993 }
994 _iconview->setShowToolTips( b ); 994 _iconview->setShowToolTips( b );
995} 995}
996bool OVersatileView::showToolTips() const // QIconView 996bool OVersatileView::showToolTips() const // QIconView
997{ 997{
998 if ( not isValidViewMode( Icons ) ) 998 if ( !isValidViewMode( Icons ) )
999 { 999 {
1000 return false; 1000 return false;
1001 } 1001 }
1002 return _iconview->showToolTips(); 1002 return _iconview->showToolTips();
1003} 1003}
1004 1004
1005bool OVersatileView::sorting() const // QIconView 1005bool OVersatileView::sorting() const // QIconView
1006{ 1006{
1007 if ( not isValidViewMode( Icons ) ) 1007 if ( !isValidViewMode( Icons ) )
1008 { 1008 {
1009 return false; 1009 return false;
1010 } 1010 }
1011 return _iconview->sorting(); 1011 return _iconview->sorting();
1012} 1012}
1013bool OVersatileView::sortDirection() const // QIconView 1013bool OVersatileView::sortDirection() const // QIconView
1014{ 1014{
1015 if ( not isValidViewMode( Icons ) ) 1015 if ( !isValidViewMode( Icons ) )
1016 { 1016 {
1017 return false; 1017 return false;
1018 } 1018 }
1019 return _iconview->sortDirection(); 1019 return _iconview->sortDirection();
1020} 1020}
1021 1021
1022 void OVersatileView::setItemsMovable( bool b ) // QIconView 1022 void OVersatileView::setItemsMovable( bool b ) // QIconView
1023{ 1023{
1024 if ( not isValidViewMode( Icons ) ) 1024 if ( !isValidViewMode( Icons ) )
1025 { 1025 {
1026 return; 1026 return;
1027 } 1027 }
1028 _iconview->setItemsMovable( b ); 1028 _iconview->setItemsMovable( b );
1029} 1029}
1030bool OVersatileView::itemsMovable() const // QIconView 1030bool OVersatileView::itemsMovable() const // QIconView
1031{ 1031{
1032 if ( not isValidViewMode( Icons ) ) 1032 if ( !isValidViewMode( Icons ) )
1033 { 1033 {
1034 return false; 1034 return false;
1035 } 1035 }
1036 return _iconview->itemsMovable(); 1036 return _iconview->itemsMovable();
1037} 1037}
1038void OVersatileView::setWordWrapIconText( bool b ) // QIconView 1038void OVersatileView::setWordWrapIconText( bool b ) // QIconView
1039{ 1039{
1040 if ( not isValidViewMode( Icons ) ) 1040 if ( !isValidViewMode( Icons ) )
1041 { 1041 {
1042 return; 1042 return;
1043 } 1043 }
1044 _iconview->setWordWrapIconText( b ); 1044 _iconview->setWordWrapIconText( b );
1045} 1045}
1046bool OVersatileView::wordWrapIconText() const // QIconView 1046bool OVersatileView::wordWrapIconText() const // QIconView
1047{ 1047{
1048 if ( not isValidViewMode( Icons ) ) 1048 if ( !isValidViewMode( Icons ) )
1049 { 1049 {
1050 return false; 1050 return false;
1051 } 1051 }
1052 return _iconview->wordWrapIconText(); 1052 return _iconview->wordWrapIconText();
1053} 1053}
1054 1054
1055void OVersatileView::arrangeItemsInGrid( const QSize &grid, bool update ) // QIconView 1055void OVersatileView::arrangeItemsInGrid( const QSize &grid, bool update ) // QIconView
1056{ 1056{
1057 if ( not isValidViewMode( Icons ) ) 1057 if ( !isValidViewMode( Icons ) )
1058 { 1058 {
1059 return; 1059 return;
1060 } 1060 }
1061 _iconview->arrangeItemsInGrid( grid, update ); 1061 _iconview->arrangeItemsInGrid( grid, update );
1062} 1062}
1063void OVersatileView::arrangeItemsInGrid( bool update ) // QIconView 1063void OVersatileView::arrangeItemsInGrid( bool update ) // QIconView
1064{ 1064{
1065 if ( not isValidViewMode( Icons ) ) 1065 if ( !isValidViewMode( Icons ) )
1066 { 1066 {
1067 return; 1067 return;
1068 } 1068 }
1069 _iconview->arrangeItemsInGrid( update ); 1069 _iconview->arrangeItemsInGrid( update );
1070} 1070}
1071void OVersatileView::updateContents() // QIconView 1071void OVersatileView::updateContents() // QIconView
1072{ 1072{
1073 if ( not isValidViewMode( Icons ) ) 1073 if ( !isValidViewMode( Icons ) )
1074 { 1074 {
1075 return; 1075 return;
1076 } 1076 }
1077 _iconview->updateContents(); 1077 _iconview->updateContents();
1078} 1078}
1079 1079
1080//==============================================================================================// 1080//==============================================================================================//
1081// OVersatileView Case II - QListView / QIconView common API 1081// OVersatileView Case II - QListView / QIconView common API
1082//==============================================================================================// 1082//==============================================================================================//
1083 1083
1084void OVersatileView::clear() 1084void OVersatileView::clear()
1085{ 1085{
diff --git a/libopie2/opieui/oversatileviewitem.cpp b/libopie2/opieui/oversatileviewitem.cpp
index 379ce24..66de8eb 100644
--- a/libopie2/opieui/oversatileviewitem.cpp
+++ b/libopie2/opieui/oversatileviewitem.cpp
@@ -87,25 +87,25 @@ OVersatileViewItem::OVersatileViewItem( OVersatileViewItem * parent, OVersatileV
87 87
88OVersatileViewItem::~OVersatileViewItem() 88OVersatileViewItem::~OVersatileViewItem()
89{ 89{
90} 90}
91 91
92OVersatileView* OVersatileViewItem::versatileView() const 92OVersatileView* OVersatileViewItem::versatileView() const
93{ 93{
94 return _versatileview; 94 return _versatileview;
95} 95}
96 96
97void OVersatileViewItem::init() 97void OVersatileViewItem::init()
98{ 98{
99 if ( not firstChild() ) 99 if ( !firstChild() )
100 { 100 {
101 // I'm a sweet yellow and browne autumn leaf 101 // I'm a sweet yellow and browne autumn leaf
102 102
103 OListViewItem::setPixmap( 0, _versatileview->_treeleaf ); 103 OListViewItem::setPixmap( 0, _versatileview->_treeleaf );
104 QIconViewItem::setPixmap( _versatileview->_iconleaf ); 104 QIconViewItem::setPixmap( _versatileview->_iconleaf );
105 } 105 }
106 else 106 else
107 { 107 {
108 // I'm a node and I have a little baby child 108 // I'm a node and I have a little baby child
109 109
110 if ( isOpen() ) 110 if ( isOpen() )
111 { 111 {