Author: sh-sh-sh Date: Tue Oct 30 13:39:48 2007 New Revision: 41638 URL: http://svn.opensuse.org/viewcvs/yast?rev=41638&view=rev Log: removed duplicate members Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc branches/tmp/sh/mod-ui/ncurses/src/NCTable.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc?rev=41638&r1=41637&r2=41638&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc Tue Oct 30 13:39:48 2007 @@ -41,7 +41,6 @@ , biglist( false ) { WIDDBG << endl; - immediate = immediateMode(); InitPad(); // !!! head is UTF8 encoded, thus should be vector<NCstring> @@ -114,21 +113,6 @@ } -///////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCTable::setKeepSorting -// METHOD TYPE : void -// -// DESCRIPTION : set flag according to `opt(`keepSorting) -// - -void NCTable::setKeepSorting ( bool keepSorting ) -{ - YTable::setKeepSorting( keepSorting ); - sortable = keepSorting; -} - /////////////////////////////////////////////////////////////////// // // @@ -182,6 +166,8 @@ string s; switch ( al ) { + case YAlignUnchanged: s = 'L' ; break; + case YAlignBegin: s = 'L' ; break; case YAlignCenter: s = 'C' ; break; case YAlignEnd: s = 'R' ; break; @@ -266,7 +252,7 @@ { if ( !myPad()->Lines() ) return -1; - return sortable ? myPad()->GetLine( myPad()->CurPos().L )->getIndex () + return ( ! keepSorting() ) ? myPad()->GetLine( myPad()->CurPos().L )->getIndex () : myPad()->CurPos().L; } @@ -530,7 +516,7 @@ selectCurrentItem(); - if ( notify() && immediate && citem != getCurrentItem() ) + if ( notify() && immediateMode() && citem != getCurrentItem() ) { ret = NCursesEvent::SelectionChanged; } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCTable.h?rev=41638&r1=41637&r2=41638&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTable.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTable.h Tue Oct 30 13:39:48 2007 @@ -43,9 +43,6 @@ private: - bool immediate; - bool sortable; - vector<NCstring> _header; protected: @@ -80,9 +77,6 @@ bool bigList() const { return biglist; } - bool isImmediate() const { return immediate; } // addey by gs - void setKeepSorting( bool keepSorting ); - void setHeader( int col, const string & text ); // added by gs void setHeader ( vector<string> header ); virtual void setAlignment ( int col, YAlignmentType al ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org