author | erik <erik> | 2007-01-29 22:00:04 (UTC) |
---|---|---|
committer | erik <erik> | 2007-01-29 22:00:04 (UTC) |
commit | 9a3875c32922a322d991e67b13e89242f71a862c (patch) (unidiff) | |
tree | 4f5c7c79f7e1ee70f19b5cc3d75131b8151ad9cd /libqtaux/qsplitter.cpp | |
parent | 02ef45be75a3024df11365956e1cce6392d9103c (diff) | |
download | opie-9a3875c32922a322d991e67b13e89242f71a862c.zip opie-9a3875c32922a322d991e67b13e89242f71a862c.tar.gz opie-9a3875c32922a322d991e67b13e89242f71a862c.tar.bz2 |
Each file in this commit exhibits a problem where a variable is made in
some way but never used. This is a tricky problem with Qt since almost all
UI forms are made but not used (like QLabel). But I am pretty confident that
these changes are correct and do not have any aspect of a change to the UI.
In most cases, there are just variables that are made and then copied over
(like in iteration over lists or assignment of pointers based on
conditionals).
-rw-r--r-- | libqtaux/qsplitter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libqtaux/qsplitter.cpp b/libqtaux/qsplitter.cpp index 39321f8..959d5e1 100644 --- a/libqtaux/qsplitter.cpp +++ b/libqtaux/qsplitter.cpp | |||
@@ -602,257 +602,257 @@ void QSplitter::moveAfter( int pos, int id, bool upLeft ) | |||
602 | \sa idAfter() | 602 | \sa idAfter() |
603 | */ | 603 | */ |
604 | 604 | ||
605 | void QSplitter::getRange( int id, int *min, int *max ) | 605 | void QSplitter::getRange( int id, int *min, int *max ) |
606 | { | 606 | { |
607 | int minB = 0;//before | 607 | int minB = 0;//before |
608 | int maxB = 0; | 608 | int maxB = 0; |
609 | int minA = 0; | 609 | int minA = 0; |
610 | int maxA = 0;//after | 610 | int maxA = 0;//after |
611 | int n = data->list.count(); | 611 | int n = data->list.count(); |
612 | if ( id < 0 || id >= n ) | 612 | if ( id < 0 || id >= n ) |
613 | return; | 613 | return; |
614 | int i; | 614 | int i; |
615 | for ( i = 0; i < id; i++ ) { | 615 | for ( i = 0; i < id; i++ ) { |
616 | QSplitterLayoutStruct *s = data->list.at(i); | 616 | QSplitterLayoutStruct *s = data->list.at(i); |
617 | if ( s->wid->isHidden() ) { | 617 | if ( s->wid->isHidden() ) { |
618 | //ignore | 618 | //ignore |
619 | } else if ( s->isSplitter ) { | 619 | } else if ( s->isSplitter ) { |
620 | minB += s->sizer; | 620 | minB += s->sizer; |
621 | maxB += s->sizer; | 621 | maxB += s->sizer; |
622 | } else { | 622 | } else { |
623 | minB += pick( minSize(s->wid) ); | 623 | minB += pick( minSize(s->wid) ); |
624 | maxB += pick( s->wid->maximumSize() ); | 624 | maxB += pick( s->wid->maximumSize() ); |
625 | } | 625 | } |
626 | } | 626 | } |
627 | for ( i = id; i < n; i++ ) { | 627 | for ( i = id; i < n; i++ ) { |
628 | QSplitterLayoutStruct *s = data->list.at(i); | 628 | QSplitterLayoutStruct *s = data->list.at(i); |
629 | if ( s->wid->isHidden() ) { | 629 | if ( s->wid->isHidden() ) { |
630 | //ignore | 630 | //ignore |
631 | } else if ( s->isSplitter ) { | 631 | } else if ( s->isSplitter ) { |
632 | minA += s->sizer; | 632 | minA += s->sizer; |
633 | maxA += s->sizer; | 633 | maxA += s->sizer; |
634 | } else { | 634 | } else { |
635 | minA += pick( minSize(s->wid) ); | 635 | minA += pick( minSize(s->wid) ); |
636 | maxA += pick( s->wid->maximumSize() ); | 636 | maxA += pick( s->wid->maximumSize() ); |
637 | } | 637 | } |
638 | } | 638 | } |
639 | QRect r = contentsRect(); | 639 | QRect r = contentsRect(); |
640 | if ( min ) | 640 | if ( min ) |
641 | *min = pick(r.topLeft()) + QMAX( minB, pick(r.size())-maxA ); | 641 | *min = pick(r.topLeft()) + QMAX( minB, pick(r.size())-maxA ); |
642 | if ( max ) | 642 | if ( max ) |
643 | *max = pick(r.topLeft()) + QMIN( maxB, pick(r.size())-minA ); | 643 | *max = pick(r.topLeft()) + QMIN( maxB, pick(r.size())-minA ); |
644 | 644 | ||
645 | } | 645 | } |
646 | 646 | ||
647 | 647 | ||
648 | /*! | 648 | /*! |
649 | Returns the legal position closest to \a p of the splitter with id \a id. | 649 | Returns the legal position closest to \a p of the splitter with id \a id. |
650 | 650 | ||
651 | \sa idAfter() | 651 | \sa idAfter() |
652 | */ | 652 | */ |
653 | 653 | ||
654 | int QSplitter::adjustPos( int p, int id ) | 654 | int QSplitter::adjustPos( int p, int id ) |
655 | { | 655 | { |
656 | int min = 0; | 656 | int min = 0; |
657 | int max = 0; | 657 | int max = 0; |
658 | getRange( id, &min, &max ); | 658 | getRange( id, &min, &max ); |
659 | p = QMAX( min, QMIN( p, max ) ); | 659 | p = QMAX( min, QMIN( p, max ) ); |
660 | 660 | ||
661 | return p; | 661 | return p; |
662 | } | 662 | } |
663 | 663 | ||
664 | 664 | ||
665 | void QSplitter::doResize() | 665 | void QSplitter::doResize() |
666 | { | 666 | { |
667 | QRect r = contentsRect(); | 667 | QRect r = contentsRect(); |
668 | int i; | 668 | int i; |
669 | int n = data->list.count(); | 669 | int n = data->list.count(); |
670 | QArray<QLayoutStruct> a( n ); | 670 | QArray<QLayoutStruct> a( n ); |
671 | for ( i = 0; i< n; i++ ) { | 671 | for ( i = 0; i< n; i++ ) { |
672 | a[i].init(); | 672 | a[i].init(); |
673 | QSplitterLayoutStruct *s = data->list.at(i); | 673 | QSplitterLayoutStruct *s = data->list.at(i); |
674 | if ( s->wid->isHidden() ) { | 674 | if ( s->wid->isHidden() ) { |
675 | a[i].stretch = 0; | 675 | a[i].stretch = 0; |
676 | a[i].sizeHint = a[i].minimumSize = 0; | 676 | a[i].sizeHint = a[i].minimumSize = 0; |
677 | a[i].maximumSize = 0; | 677 | a[i].maximumSize = 0; |
678 | } else if ( s->isSplitter ) { | 678 | } else if ( s->isSplitter ) { |
679 | a[i].stretch = 0; | 679 | a[i].stretch = 0; |
680 | a[i].sizeHint = a[i].minimumSize = a[i].maximumSize = s->sizer; | 680 | a[i].sizeHint = a[i].minimumSize = a[i].maximumSize = s->sizer; |
681 | a[i].empty = FALSE; | 681 | a[i].empty = FALSE; |
682 | } else if ( s->mode == KeepSize ) { | 682 | } else if ( s->mode == KeepSize ) { |
683 | a[i].stretch = 0; | 683 | a[i].stretch = 0; |
684 | a[i].minimumSize = pick( minSize(s->wid) ); | 684 | a[i].minimumSize = pick( minSize(s->wid) ); |
685 | a[i].sizeHint = s->sizer; | 685 | a[i].sizeHint = s->sizer; |
686 | a[i].maximumSize = pick( s->wid->maximumSize() ); | 686 | a[i].maximumSize = pick( s->wid->maximumSize() ); |
687 | a[i].empty = FALSE; | 687 | a[i].empty = FALSE; |
688 | } else if ( s->mode == FollowSizeHint ) { | 688 | } else if ( s->mode == FollowSizeHint ) { |
689 | a[i].stretch = 0; | 689 | a[i].stretch = 0; |
690 | a[i].minimumSize = a[i].sizeHint = pick( s->wid->sizeHint() ); | 690 | a[i].minimumSize = a[i].sizeHint = pick( s->wid->sizeHint() ); |
691 | a[i].maximumSize = pick( s->wid->maximumSize() ); | 691 | a[i].maximumSize = pick( s->wid->maximumSize() ); |
692 | a[i].empty = FALSE; | 692 | a[i].empty = FALSE; |
693 | } else { //proportional | 693 | } else { //proportional |
694 | a[i].stretch = s->sizer; | 694 | a[i].stretch = s->sizer; |
695 | a[i].maximumSize = pick( s->wid->maximumSize() ); | 695 | a[i].maximumSize = pick( s->wid->maximumSize() ); |
696 | a[i].sizeHint = a[i].minimumSize = pick( minSize(s->wid) ); | 696 | a[i].sizeHint = a[i].minimumSize = pick( minSize(s->wid) ); |
697 | a[i].empty = FALSE; | 697 | a[i].empty = FALSE; |
698 | } | 698 | } |
699 | } | 699 | } |
700 | 700 | ||
701 | qGeomCalc( a, 0, n, pick( r.topLeft() ), pick( r.size() ), 0 ); | 701 | qGeomCalc( a, 0, n, pick( r.topLeft() ), pick( r.size() ), 0 ); |
702 | for ( i = 0; i< n; i++ ) { | 702 | for ( i = 0; i< n; i++ ) { |
703 | QSplitterLayoutStruct *s = data->list.at(i); | 703 | QSplitterLayoutStruct *s = data->list.at(i); |
704 | if ( orient == Horizontal ) | 704 | if ( orient == Horizontal ) |
705 | s->wid->setGeometry( a[i].pos, r.top(), a[i].size, r.height() ); | 705 | s->wid->setGeometry( a[i].pos, r.top(), a[i].size, r.height() ); |
706 | else | 706 | else |
707 | s->wid->setGeometry( r.left(), a[i].pos, r.width(), a[i].size ); | 707 | s->wid->setGeometry( r.left(), a[i].pos, r.width(), a[i].size ); |
708 | } | 708 | } |
709 | 709 | ||
710 | } | 710 | } |
711 | 711 | ||
712 | 712 | ||
713 | void QSplitter::recalc( bool update ) | 713 | void QSplitter::recalc( bool update ) |
714 | { | 714 | { |
715 | int fi = 2*frameWidth(); | 715 | int fi = 2*frameWidth(); |
716 | int maxl = fi; | 716 | int maxl = fi; |
717 | int minl = fi; | 717 | int minl = fi; |
718 | int maxt = QWIDGETSIZE_MAX; | 718 | int maxt = QWIDGETSIZE_MAX; |
719 | int mint = fi; | 719 | int mint = fi; |
720 | int n = data->list.count(); | 720 | int n = data->list.count(); |
721 | bool first = TRUE; | 721 | bool first = TRUE; |
722 | /* | 722 | /* |
723 | The splitter before a hidden widget is always hidden. | 723 | The splitter before a hidden widget is always hidden. |
724 | The splitter before the first visible widget is hidden. | 724 | The splitter before the first visible widget is hidden. |
725 | The splitter before any other visible widget is visible. | 725 | The splitter before any other visible widget is visible. |
726 | */ | 726 | */ |
727 | for ( int i = 0; i< n; i++ ) { | 727 | for ( int i = 0; i< n; i++ ) { |
728 | QSplitterLayoutStruct *s = data->list.at(i); | 728 | QSplitterLayoutStruct *s = data->list.at(i); |
729 | if ( !s->isSplitter ) { | 729 | if ( !s->isSplitter ) { |
730 | QSplitterLayoutStruct *p = (i > 0) ? p = data->list.at( i-1 ) : 0; | 730 | QSplitterLayoutStruct *p = (i > 0) ? data->list.at( i-1 ) : 0; |
731 | if ( p && p->isSplitter ) | 731 | if ( p && p->isSplitter ) |
732 | if ( first || s->wid->isHidden() ) | 732 | if ( first || s->wid->isHidden() ) |
733 | p->wid->hide(); //may trigger new recalc | 733 | p->wid->hide(); //may trigger new recalc |
734 | else | 734 | else |
735 | p->wid->show(); //may trigger new recalc | 735 | p->wid->show(); //may trigger new recalc |
736 | if ( !s->wid->isHidden() ) | 736 | if ( !s->wid->isHidden() ) |
737 | first = FALSE; | 737 | first = FALSE; |
738 | } | 738 | } |
739 | } | 739 | } |
740 | 740 | ||
741 | bool empty=TRUE; | 741 | bool empty=TRUE; |
742 | for ( int j = 0; j< n; j++ ) { | 742 | for ( int j = 0; j< n; j++ ) { |
743 | QSplitterLayoutStruct *s = data->list.at(j); | 743 | QSplitterLayoutStruct *s = data->list.at(j); |
744 | if ( !s->wid->isHidden() ) { | 744 | if ( !s->wid->isHidden() ) { |
745 | empty = FALSE; | 745 | empty = FALSE; |
746 | if ( s->isSplitter ) { | 746 | if ( s->isSplitter ) { |
747 | minl += s->sizer; | 747 | minl += s->sizer; |
748 | maxl += s->sizer; | 748 | maxl += s->sizer; |
749 | } else { | 749 | } else { |
750 | QSize minS = minSize(s->wid); | 750 | QSize minS = minSize(s->wid); |
751 | minl += pick( minS ); | 751 | minl += pick( minS ); |
752 | maxl += pick( s->wid->maximumSize() ); | 752 | maxl += pick( s->wid->maximumSize() ); |
753 | mint = QMAX( mint, trans( minS )); | 753 | mint = QMAX( mint, trans( minS )); |
754 | int tm = trans( s->wid->maximumSize() ); | 754 | int tm = trans( s->wid->maximumSize() ); |
755 | if ( tm > 0 ) | 755 | if ( tm > 0 ) |
756 | maxt = QMIN( maxt, tm ); | 756 | maxt = QMIN( maxt, tm ); |
757 | } | 757 | } |
758 | } | 758 | } |
759 | } | 759 | } |
760 | if ( empty ) | 760 | if ( empty ) |
761 | maxl = maxt = 0; | 761 | maxl = maxt = 0; |
762 | else | 762 | else |
763 | maxl = QMIN( maxl, QWIDGETSIZE_MAX ); | 763 | maxl = QMIN( maxl, QWIDGETSIZE_MAX ); |
764 | if ( maxt < mint ) | 764 | if ( maxt < mint ) |
765 | maxt = mint; | 765 | maxt = mint; |
766 | 766 | ||
767 | if ( orient == Horizontal ) { | 767 | if ( orient == Horizontal ) { |
768 | setMaximumSize( maxl, maxt ); | 768 | setMaximumSize( maxl, maxt ); |
769 | setMinimumSize( minl, mint ); | 769 | setMinimumSize( minl, mint ); |
770 | } else { | 770 | } else { |
771 | setMaximumSize( maxt, maxl ); | 771 | setMaximumSize( maxt, maxl ); |
772 | setMinimumSize( mint, minl ); | 772 | setMinimumSize( mint, minl ); |
773 | } | 773 | } |
774 | if ( update ) | 774 | if ( update ) |
775 | doResize(); | 775 | doResize(); |
776 | } | 776 | } |
777 | 777 | ||
778 | /*! \enum QSplitter::ResizeMode | 778 | /*! \enum QSplitter::ResizeMode |
779 | 779 | ||
780 | This enum type describes how QSplitter will resize each of its child widgets. The currently defined values are: <ul> | 780 | This enum type describes how QSplitter will resize each of its child widgets. The currently defined values are: <ul> |
781 | 781 | ||
782 | <li> \c Stretch - the widget will be resized when the splitter | 782 | <li> \c Stretch - the widget will be resized when the splitter |
783 | itself is resized. | 783 | itself is resized. |
784 | 784 | ||
785 | <li> \c KeepSize - QSplitter will try to keep this widget's size | 785 | <li> \c KeepSize - QSplitter will try to keep this widget's size |
786 | unchanged. | 786 | unchanged. |
787 | 787 | ||
788 | <li> \c FollowSizeHint - QSplitter will resize the widget when its | 788 | <li> \c FollowSizeHint - QSplitter will resize the widget when its |
789 | size hint changes. | 789 | size hint changes. |
790 | 790 | ||
791 | </ul> | 791 | </ul> |
792 | 792 | ||
793 | */ | 793 | */ |
794 | 794 | ||
795 | /*! | 795 | /*! |
796 | Sets resize mode of \a w to \a mode. | 796 | Sets resize mode of \a w to \a mode. |
797 | 797 | ||
798 | \sa ResizeMode | 798 | \sa ResizeMode |
799 | */ | 799 | */ |
800 | 800 | ||
801 | void QSplitter::setResizeMode( QWidget *w, ResizeMode mode ) | 801 | void QSplitter::setResizeMode( QWidget *w, ResizeMode mode ) |
802 | { | 802 | { |
803 | processChildEvents(); | 803 | processChildEvents(); |
804 | QSplitterLayoutStruct *s = data->list.first(); | 804 | QSplitterLayoutStruct *s = data->list.first(); |
805 | while ( s ) { | 805 | while ( s ) { |
806 | if ( s->wid == w ) { | 806 | if ( s->wid == w ) { |
807 | s->mode = mode; | 807 | s->mode = mode; |
808 | return; | 808 | return; |
809 | } | 809 | } |
810 | s = data->list.next(); | 810 | s = data->list.next(); |
811 | } | 811 | } |
812 | s = addWidget( w, TRUE ); | 812 | s = addWidget( w, TRUE ); |
813 | s->mode = mode; | 813 | s->mode = mode; |
814 | } | 814 | } |
815 | 815 | ||
816 | 816 | ||
817 | /*! | 817 | /*! |
818 | Returns TRUE if opaque resize is on, FALSE otherwise. | 818 | Returns TRUE if opaque resize is on, FALSE otherwise. |
819 | 819 | ||
820 | \sa setOpaqueResize() | 820 | \sa setOpaqueResize() |
821 | */ | 821 | */ |
822 | 822 | ||
823 | bool QSplitter::opaqueResize() const | 823 | bool QSplitter::opaqueResize() const |
824 | { | 824 | { |
825 | return data->opaque; | 825 | return data->opaque; |
826 | } | 826 | } |
827 | 827 | ||
828 | 828 | ||
829 | /*! | 829 | /*! |
830 | Sets opaque resize to \a on. Opaque resize is initially turned off. | 830 | Sets opaque resize to \a on. Opaque resize is initially turned off. |
831 | 831 | ||
832 | \sa opaqueResize() | 832 | \sa opaqueResize() |
833 | */ | 833 | */ |
834 | 834 | ||
835 | void QSplitter::setOpaqueResize( bool on ) | 835 | void QSplitter::setOpaqueResize( bool on ) |
836 | { | 836 | { |
837 | data->opaque = on; | 837 | data->opaque = on; |
838 | } | 838 | } |
839 | 839 | ||
840 | 840 | ||
841 | /*! | 841 | /*! |
842 | Moves \a w to the leftmost/top position. | 842 | Moves \a w to the leftmost/top position. |
843 | */ | 843 | */ |
844 | 844 | ||
845 | void QSplitter::moveToFirst( QWidget *w ) | 845 | void QSplitter::moveToFirst( QWidget *w ) |
846 | { | 846 | { |
847 | processChildEvents(); | 847 | processChildEvents(); |
848 | bool found = FALSE; | 848 | bool found = FALSE; |
849 | QSplitterLayoutStruct *s = data->list.first(); | 849 | QSplitterLayoutStruct *s = data->list.first(); |
850 | while ( s ) { | 850 | while ( s ) { |
851 | if ( s->wid == w ) { | 851 | if ( s->wid == w ) { |
852 | found = TRUE; | 852 | found = TRUE; |
853 | QSplitterLayoutStruct *p = data->list.prev(); | 853 | QSplitterLayoutStruct *p = data->list.prev(); |
854 | if ( p ) { // not already at first place | 854 | if ( p ) { // not already at first place |
855 | data->list.take(); //take p | 855 | data->list.take(); //take p |
856 | data->list.take(); // take s | 856 | data->list.take(); // take s |
857 | data->list.insert( 0, p ); | 857 | data->list.insert( 0, p ); |
858 | data->list.insert( 0, s ); | 858 | data->list.insert( 0, s ); |