author | mickeyl <mickeyl> | 2003-03-30 02:59:54 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-03-30 02:59:54 (UTC) |
commit | e1c4cb3364f8f7ff68da88b5ec26053ee561c8a1 (patch) (unidiff) | |
tree | a7688f2a87c3aa29e7672c9d865d3a953f15ff87 | |
parent | 15ee85466704072173296ff4f0f446cd8fe81d1e (diff) | |
download | opie-e1c4cb3364f8f7ff68da88b5ec26053ee561c8a1.zip opie-e1c4cb3364f8f7ff68da88b5ec26053ee561c8a1.tar.gz opie-e1c4cb3364f8f7ff68da88b5ec26053ee561c8a1.tar.bz2 |
convert my beloved "not" to "!" to make ancient compilers happy, but not me...
-rw-r--r-- | libopie2/opieui/oversatileview.cpp | 152 | ||||
-rw-r--r-- | libopie2/opieui/oversatileviewitem.cpp | 2 |
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 | |||
@@ -257,7 +257,7 @@ void OVersatileView::contextMenuRequested( QIconViewItem* item, const QPoint& po | |||
257 | 257 | ||
258 | void OVersatileView::popupContextMenu( OVersatileViewItem* item, const QPoint& pos, int col ) | 258 | void 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 ) ); |
@@ -449,13 +449,13 @@ void OVersatileView::onItem( QIconViewItem * item ) | |||
449 | void OVersatileView::expanded( QListViewItem *item ) // QListView | 449 | void 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 | } |
456 | void OVersatileView::collapsed( QListViewItem *item ) // QListView | 456 | void 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 | } |
@@ -466,7 +466,7 @@ void OVersatileView::collapsed( QListViewItem *item ) // QListView | |||
466 | 466 | ||
467 | int OVersatileView::treeStepSize() const // QListView | 467 | int 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 | } |
@@ -474,7 +474,7 @@ int OVersatileView::treeStepSize() const // QListView | |||
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 | } |
@@ -483,7 +483,7 @@ int OVersatileView::treeStepSize() const // QListView | |||
483 | 483 | ||
484 | QHeader * OVersatileView::header() const // QListView | 484 | QHeader * 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 | } |
@@ -492,16 +492,16 @@ QHeader * OVersatileView::header() const // QListView | |||
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 | } |
@@ -510,7 +510,7 @@ QHeader * OVersatileView::header() const // QListView | |||
510 | 510 | ||
511 | void OVersatileView::removeColumn( int index ) // QListView | 511 | void OVersatileView::removeColumn( int index ) // QListView |
512 | { | 512 | { |
513 | if ( not isValidViewMode( Tree ) ) | 513 | if ( !isValidViewMode( Tree ) ) |
514 | { | 514 | { |
515 | return; | 515 | return; |
516 | } | 516 | } |
@@ -518,7 +518,7 @@ void OVersatileView::removeColumn( int index ) // QListView | |||
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 | } |
@@ -526,7 +526,7 @@ void OVersatileView::removeColumn( int index ) // QListView | |||
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 | } |
@@ -534,7 +534,7 @@ void OVersatileView::removeColumn( int index ) // QListView | |||
534 | } | 534 | } |
535 | QString OVersatileView::columnText( int column ) const // QListView | 535 | QString 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 | } |
@@ -542,7 +542,7 @@ QString OVersatileView::columnText( int column ) const // QListView | |||
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 | } |
@@ -550,7 +550,7 @@ QString OVersatileView::columnText( int column ) const // QListView | |||
550 | } | 550 | } |
551 | int OVersatileView::columnWidth( int column ) const // QListView | 551 | int 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 | } |
@@ -558,7 +558,7 @@ int OVersatileView::columnWidth( int column ) const // QListView | |||
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 | } |
@@ -566,7 +566,7 @@ int OVersatileView::columnWidth( int column ) const // QListView | |||
566 | } | 566 | } |
567 | int OVersatileView::columns() const // QListView | 567 | int 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 | } |
@@ -575,7 +575,7 @@ int OVersatileView::columns() const // QListView | |||
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 | } |
@@ -583,7 +583,7 @@ int OVersatileView::columns() const // QListView | |||
583 | } | 583 | } |
584 | int OVersatileView::columnAlignment( int column ) const // QListView | 584 | int 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 | } |
@@ -592,7 +592,7 @@ int OVersatileView::columnAlignment( int column ) const // QListView | |||
592 | 592 | ||
593 | OVersatileViewItem * OVersatileView::itemAt( const QPoint & screenPos ) const // QListView | 593 | OVersatileViewItem * 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 | } |
@@ -600,7 +600,7 @@ OVersatileViewItem * OVersatileView::itemAt( const QPoint & screenPos ) const / | |||
600 | } | 600 | } |
601 | QRect OVersatileView::itemRect( const OVersatileViewItem * item ) const // QListView | 601 | QRect 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 | } |
@@ -608,7 +608,7 @@ QRect OVersatileView::itemRect( const OVersatileViewItem * item ) const // QLis | |||
608 | } | 608 | } |
609 | int OVersatileView::itemPos( const OVersatileViewItem * item ) // QListView | 609 | int 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 | } |
@@ -617,7 +617,7 @@ int OVersatileView::itemPos( const OVersatileViewItem * item ) // QListView | |||
617 | 617 | ||
618 | bool OVersatileView::isSelected( const OVersatileViewItem * item ) const // QListView // also in QIconViewItem but !in QIconView *shrug* | 618 | bool 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 | } |
@@ -635,7 +635,7 @@ bool OVersatileView::isMultiSelection() const | |||
635 | 635 | ||
636 | OVersatileViewItem * OVersatileView::selectedItem() const // QListView | 636 | OVersatileViewItem * 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 | } |
@@ -643,7 +643,7 @@ OVersatileViewItem * OVersatileView::selectedItem() const // QListView | |||
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 | } |
@@ -651,7 +651,7 @@ OVersatileViewItem * OVersatileView::selectedItem() const // QListView | |||
651 | } | 651 | } |
652 | bool OVersatileView::isOpen( const OVersatileViewItem * item ) const // QListView | 652 | bool 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 | } |
@@ -660,7 +660,7 @@ bool OVersatileView::isOpen( const OVersatileViewItem * item ) const // QListVi | |||
660 | 660 | ||
661 | OVersatileViewItem * OVersatileView::firstChild() const // QListView | 661 | OVersatileViewItem * 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 | } |
@@ -668,7 +668,7 @@ OVersatileViewItem * OVersatileView::firstChild() const // QListView | |||
668 | } | 668 | } |
669 | int OVersatileView::childCount() const // QListView | 669 | int 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 | } |
@@ -677,7 +677,7 @@ int OVersatileView::childCount() const // QListView | |||
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 | } |
@@ -685,7 +685,7 @@ int OVersatileView::childCount() const // QListView | |||
685 | } | 685 | } |
686 | bool OVersatileView::allColumnsShowFocus() const // QListView | 686 | bool 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 | } |
@@ -694,7 +694,7 @@ bool OVersatileView::allColumnsShowFocus() const // QListView | |||
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 | } |
@@ -702,7 +702,7 @@ bool OVersatileView::allColumnsShowFocus() const // QListView | |||
702 | } | 702 | } |
703 | int OVersatileView::itemMargin() const // QListView | 703 | int 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 | } |
@@ -711,7 +711,7 @@ int OVersatileView::itemMargin() const // QListView | |||
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 | } |
@@ -719,7 +719,7 @@ int OVersatileView::itemMargin() const // QListView | |||
719 | } | 719 | } |
720 | bool OVersatileView::rootIsDecorated() const // QListView | 720 | bool 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 | } |
@@ -728,7 +728,7 @@ bool OVersatileView::rootIsDecorated() const // QListView | |||
728 | 728 | ||
729 | void OVersatileView::setShowSortIndicator( bool show ) // QListView | 729 | void OVersatileView::setShowSortIndicator( bool show ) // QListView |
730 | { | 730 | { |
731 | if ( not isValidViewMode( Tree ) ) | 731 | if ( !isValidViewMode( Tree ) ) |
732 | { | 732 | { |
733 | return; | 733 | return; |
734 | } | 734 | } |
@@ -736,7 +736,7 @@ void OVersatileView::setShowSortIndicator( bool show ) // QListView | |||
736 | } | 736 | } |
737 | bool OVersatileView::showSortIndicator() const // QListView | 737 | bool 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 | } |
@@ -745,7 +745,7 @@ bool OVersatileView::showSortIndicator() const // QListView | |||
745 | 745 | ||
746 | void OVersatileView::triggerUpdate() // QListView | 746 | void OVersatileView::triggerUpdate() // QListView |
747 | { | 747 | { |
748 | if ( not isValidViewMode( Tree ) ) | 748 | if ( !isValidViewMode( Tree ) ) |
749 | { | 749 | { |
750 | return; | 750 | return; |
751 | } | 751 | } |
@@ -758,7 +758,7 @@ void OVersatileView::triggerUpdate() // QListView | |||
758 | 758 | ||
759 | uint OVersatileView::count() const // QIconView | 759 | uint 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 | } |
@@ -767,7 +767,7 @@ uint OVersatileView::count() const // QIconView | |||
767 | 767 | ||
768 | int OVersatileView::index( const OVersatileViewItem *item ) const // QIconView | 768 | int 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 | } |
@@ -776,7 +776,7 @@ int OVersatileView::index( const OVersatileViewItem *item ) const // QIconView | |||
776 | 776 | ||
777 | OVersatileViewItem* OVersatileView::firstItem() const // QIconView | 777 | OVersatileViewItem* 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 | } |
@@ -784,7 +784,7 @@ OVersatileViewItem* OVersatileView::firstItem() const // QIconView | |||
784 | } | 784 | } |
785 | OVersatileViewItem* OVersatileView::lastItem() const // QIconView | 785 | OVersatileViewItem* 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 | } |
@@ -793,7 +793,7 @@ OVersatileViewItem* OVersatileView::lastItem() const // QIconView | |||
793 | 793 | ||
794 | OVersatileViewItem* OVersatileView::findItem( const QPoint &pos ) const // QIconView | 794 | OVersatileViewItem* 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 | } |
@@ -801,7 +801,7 @@ OVersatileViewItem* OVersatileView::findItem( const QPoint &pos ) const // QIcon | |||
801 | } | 801 | } |
802 | OVersatileViewItem* OVersatileView::findItem( const QString &text ) const // QIconView | 802 | OVersatileViewItem* 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 | } |
@@ -810,7 +810,7 @@ OVersatileViewItem* OVersatileView::findItem( const QString &text ) const // QIc | |||
810 | 810 | ||
811 | OVersatileViewItem* OVersatileView::findFirstVisibleItem( const QRect &r ) const // QIconView | 811 | OVersatileViewItem* 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 | } |
@@ -818,7 +818,7 @@ OVersatileViewItem* OVersatileView::findFirstVisibleItem( const QRect &r ) const | |||
818 | } | 818 | } |
819 | OVersatileViewItem* OVersatileView::findLastVisibleItem( const QRect &r ) const // QIconView | 819 | OVersatileViewItem* 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 | } |
@@ -827,7 +827,7 @@ OVersatileViewItem* OVersatileView::findLastVisibleItem( const QRect &r ) const | |||
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 | } |
@@ -835,7 +835,7 @@ OVersatileViewItem* OVersatileView::findLastVisibleItem( const QRect &r ) const | |||
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 | } |
@@ -843,7 +843,7 @@ OVersatileViewItem* OVersatileView::findLastVisibleItem( const QRect &r ) const | |||
843 | } | 843 | } |
844 | int OVersatileView::gridX() const // QIconView | 844 | int 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 | } |
@@ -851,7 +851,7 @@ int OVersatileView::gridX() const // QIconView | |||
851 | } | 851 | } |
852 | int OVersatileView::gridY() const // QIconView | 852 | int 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 | } |
@@ -859,7 +859,7 @@ int OVersatileView::gridY() const // QIconView | |||
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 | } |
@@ -867,7 +867,7 @@ int OVersatileView::gridY() const // QIconView | |||
867 | } | 867 | } |
868 | int OVersatileView::spacing() const // QIconView | 868 | int 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 | } |
@@ -875,7 +875,7 @@ int OVersatileView::spacing() const // QIconView | |||
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 | } |
@@ -883,7 +883,7 @@ int OVersatileView::spacing() const // QIconView | |||
883 | } | 883 | } |
884 | QIconView::ItemTextPos OVersatileView::itemTextPos() const // QIconView | 884 | QIconView::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 | } |
@@ -891,7 +891,7 @@ QIconView::ItemTextPos OVersatileView::itemTextPos() const // QIconView | |||
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 | } |
@@ -899,7 +899,7 @@ QIconView::ItemTextPos OVersatileView::itemTextPos() const // QIconView | |||
899 | } | 899 | } |
900 | QBrush OVersatileView::itemTextBackground() const // QIconView | 900 | QBrush 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 | } |
@@ -907,7 +907,7 @@ QBrush OVersatileView::itemTextBackground() const // QIconView | |||
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 | } |
@@ -915,7 +915,7 @@ QBrush OVersatileView::itemTextBackground() const // QIconView | |||
915 | } | 915 | } |
916 | QIconView::Arrangement OVersatileView::arrangement() const // QIconView | 916 | QIconView::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 | } |
@@ -923,7 +923,7 @@ QIconView::Arrangement OVersatileView::arrangement() const // QIconView | |||
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 | } |
@@ -931,7 +931,7 @@ QIconView::Arrangement OVersatileView::arrangement() const // QIconView | |||
931 | } | 931 | } |
932 | QIconView::ResizeMode OVersatileView::resizeMode() const // QIconView | 932 | QIconView::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 | } |
@@ -939,7 +939,7 @@ QIconView::ResizeMode OVersatileView::resizeMode() const // QIconView | |||
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 | } |
@@ -947,7 +947,7 @@ QIconView::ResizeMode OVersatileView::resizeMode() const // QIconView | |||
947 | } | 947 | } |
948 | int OVersatileView::maxItemWidth() const // QIconView | 948 | int 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 | } |
@@ -955,7 +955,7 @@ int OVersatileView::maxItemWidth() const // QIconView | |||
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 | } |
@@ -963,7 +963,7 @@ int OVersatileView::maxItemWidth() const // QIconView | |||
963 | } | 963 | } |
964 | int OVersatileView::maxItemTextLength() const // QIconView | 964 | int 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 | } |
@@ -971,7 +971,7 @@ int OVersatileView::maxItemTextLength() const // QIconView | |||
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 | } |
@@ -979,7 +979,7 @@ int OVersatileView::maxItemTextLength() const // QIconView | |||
979 | } | 979 | } |
980 | bool OVersatileView::autoArrange() const // QIconView | 980 | bool 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 | } |
@@ -987,7 +987,7 @@ bool OVersatileView::autoArrange() const // QIconView | |||
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 | } |
@@ -995,7 +995,7 @@ bool OVersatileView::autoArrange() const // QIconView | |||
995 | } | 995 | } |
996 | bool OVersatileView::showToolTips() const // QIconView | 996 | bool 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 | } |
@@ -1004,7 +1004,7 @@ bool OVersatileView::showToolTips() const // QIconView | |||
1004 | 1004 | ||
1005 | bool OVersatileView::sorting() const // QIconView | 1005 | bool 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 | } |
@@ -1012,7 +1012,7 @@ bool OVersatileView::sorting() const // QIconView | |||
1012 | } | 1012 | } |
1013 | bool OVersatileView::sortDirection() const // QIconView | 1013 | bool 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 | } |
@@ -1021,7 +1021,7 @@ bool OVersatileView::sortDirection() const // QIconView | |||
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 | } |
@@ -1029,7 +1029,7 @@ bool OVersatileView::sortDirection() const // QIconView | |||
1029 | } | 1029 | } |
1030 | bool OVersatileView::itemsMovable() const // QIconView | 1030 | bool 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 | } |
@@ -1037,7 +1037,7 @@ bool OVersatileView::itemsMovable() const // QIconView | |||
1037 | } | 1037 | } |
1038 | void OVersatileView::setWordWrapIconText( bool b ) // QIconView | 1038 | void OVersatileView::setWordWrapIconText( bool b ) // QIconView |
1039 | { | 1039 | { |
1040 | if ( not isValidViewMode( Icons ) ) | 1040 | if ( !isValidViewMode( Icons ) ) |
1041 | { | 1041 | { |
1042 | return; | 1042 | return; |
1043 | } | 1043 | } |
@@ -1045,7 +1045,7 @@ void OVersatileView::setWordWrapIconText( bool b ) // QIconView | |||
1045 | } | 1045 | } |
1046 | bool OVersatileView::wordWrapIconText() const // QIconView | 1046 | bool 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 | } |
@@ -1054,7 +1054,7 @@ bool OVersatileView::wordWrapIconText() const // QIconView | |||
1054 | 1054 | ||
1055 | void OVersatileView::arrangeItemsInGrid( const QSize &grid, bool update ) // QIconView | 1055 | void 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 | } |
@@ -1062,7 +1062,7 @@ void OVersatileView::arrangeItemsInGrid( const QSize &grid, bool update ) // QI | |||
1062 | } | 1062 | } |
1063 | void OVersatileView::arrangeItemsInGrid( bool update ) // QIconView | 1063 | void OVersatileView::arrangeItemsInGrid( bool update ) // QIconView |
1064 | { | 1064 | { |
1065 | if ( not isValidViewMode( Icons ) ) | 1065 | if ( !isValidViewMode( Icons ) ) |
1066 | { | 1066 | { |
1067 | return; | 1067 | return; |
1068 | } | 1068 | } |
@@ -1070,7 +1070,7 @@ void OVersatileView::arrangeItemsInGrid( bool update ) // QIconView | |||
1070 | } | 1070 | } |
1071 | void OVersatileView::updateContents() // QIconView | 1071 | void OVersatileView::updateContents() // QIconView |
1072 | { | 1072 | { |
1073 | if ( not isValidViewMode( Icons ) ) | 1073 | if ( !isValidViewMode( Icons ) ) |
1074 | { | 1074 | { |
1075 | return; | 1075 | return; |
1076 | } | 1076 | } |
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 | |||
@@ -96,7 +96,7 @@ OVersatileView* OVersatileViewItem::versatileView() const | |||
96 | 96 | ||
97 | void OVersatileViewItem::init() | 97 | void 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 | ||