[yast-commit] r46195 - in /trunk/ncurses: ./ package/ src/

7 Apr 2008

Author: tgoettlicher
Date: Mon Apr  7 17:12:51 2008
New Revision: 46195

URL: http://svn.opensuse.org/viewcvs/yast?rev=46195&view=rev
Log:
Fixed typo widht => width in various function names

Modified:
    trunk/ncurses/VERSION
    trunk/ncurses/package/yast2-ncurses.changes
    trunk/ncurses/src/NCLogView.cc
    trunk/ncurses/src/NCMultiLineEdit.cc
    trunk/ncurses/src/NCPadWidget.h
    trunk/ncurses/src/NCPopupTable.cc
    trunk/ncurses/src/NCSelectionBox.cc
    trunk/ncurses/src/NCTable.h
    trunk/ncurses/src/NCTableItem.cc
    trunk/ncurses/src/NCTableItem.h
    trunk/ncurses/src/NCTablePad.h
    trunk/ncurses/src/NCTextPad.cc
    trunk/ncurses/src/NCTextPad.h
    trunk/ncurses/src/NCTree.cc

Modified: trunk/ncurses/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=46195&r1=46194&r2=46195&view=diff
==============================================================================

--- trunk/ncurses/VERSION (original)
+++ trunk/ncurses/VERSION Mon Apr  7 17:12:51 2008
@@ -1 +1 @@
-2.16.22
+2.16.23

Modified: trunk/ncurses/package/yast2-ncurses.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.changes?rev=46195&r1=46194&r2=46195&view=diff
==============================================================================
--- trunk/ncurses/package/yast2-ncurses.changes (original)
+++ trunk/ncurses/package/yast2-ncurses.changes Mon Apr  7 17:12:51 2008
@@ -1,6 +1,12 @@
 -------------------------------------------------------------------
 Fri Apr  4 15:42:58 CEST 2008 - sh@suse.de
 
+- Fixed typo widht => width in various function names
+- V 2.16.23 
+
+-------------------------------------------------------------------
+Fri Apr  4 15:42:58 CEST 2008 - sh@suse.de
+
 - Fixed segfault from overly optimistic assumption that the NCurses UI
   always just runs as a part of YaST2
 - V 2.16.22 

Modified: trunk/ncurses/src/NCLogView.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCLogView.cc?rev=46195&r1=46194&r2=46195&view=diff
==============================================================================
--- trunk/ncurses/src/NCLogView.cc (original)
+++ trunk/ncurses/src/NCLogView.cc Mon Apr  7 17:12:51 2008
@@ -56,7 +56,7 @@
 
 int NCLogView::preferredWidth()
 {
-    defsze.W = ( 5 > labelWidht() ? 5 : labelWidht() ) + 2;
+    defsze.W = ( 5 > labelWidth() ? 5 : labelWidth() ) + 2;
     return wGetDefsze().W;
 }
 

Modified: trunk/ncurses/src/NCMultiLineEdit.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCMultiLineEdit.cc?rev=46195&r1=46194&r2=46195&view=diff
==============================================================================
--- trunk/ncurses/src/NCMultiLineEdit.cc (original)
+++ trunk/ncurses/src/NCMultiLineEdit.cc Mon Apr  7 17:12:51 2008
@@ -63,7 +63,7 @@
 //
 int NCMultiLineEdit::preferredWidth()
 {
-    defsze.W = ( 5 > labelWidht() ? 5 : labelWidht() ) + 2;
+    defsze.W = ( 5 > labelWidth() ? 5 : labelWidth() ) + 2;
     return wGetDefsze().W;
 }
 

Modified: trunk/ncurses/src/NCPadWidget.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPadWidget.h?rev=46195&r1=46194&r2=46195&view=diff
==============================================================================
--- trunk/ncurses/src/NCPadWidget.h (original)
+++ trunk/ncurses/src/NCPadWidget.h Mon Apr  7 17:12:51 2008
@@ -71,7 +71,7 @@
     virtual const char * location() const { return "NCPadWidget"; }
 
     // widget stuff
-    unsigned labelWidht() const { return label.width(); }
+    unsigned labelWidth() const { return label.width(); }
 
     virtual void wCreate( const wrect & newrect );
     virtual void wDelete();

Modified: trunk/ncurses/src/NCPopupTable.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPopupTable.cc?rev=46195&r1=46194&r2=46195&view=diff
==============================================================================
--- trunk/ncurses/src/NCPopupTable.cc (original)
+++ trunk/ncurses/src/NCPopupTable.cc Mon Apr  7 17:12:51 2008
@@ -70,7 +70,7 @@
   
   sellist->setBigList( true );
   sellist->SetSepChar( ' ' );
-  sellist->SetSepWidht( 0 );
+  sellist->SetSepWidth( 0 );
   sellist->SetHotCol( 0 );
   sellist->setNotify( true );
 

Modified: trunk/ncurses/src/NCSelectionBox.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCSelectionBox.cc?rev=46195&r1=46194&r2=46195&view=diff
==============================================================================
--- trunk/ncurses/src/NCSelectionBox.cc (original)
+++ trunk/ncurses/src/NCSelectionBox.cc Mon Apr  7 17:12:51 2008
@@ -55,7 +55,7 @@
 int NCSelectionBox::preferredWidth()
 {
     wsze sze = ( biglist ) ? myPad()->tableSize() + 2 : wGetDefsze();
-    return sze.W > (int)(labelWidht()+2) ? sze.W : (labelWidht()+2); 
+    return sze.W > (int)(labelWidth()+2) ? sze.W : (labelWidth()+2); 
 }
 
 int NCSelectionBox::preferredHeight()

Modified: trunk/ncurses/src/NCTable.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTable.h?rev=46195&r1=46194&r2=46195&view=diff
==============================================================================
--- trunk/ncurses/src/NCTable.h (original)
+++ trunk/ncurses/src/NCTable.h Mon Apr  7 17:12:51 2008
@@ -82,7 +82,7 @@
 
     void setBigList( const bool big ) { biglist = big; }
     void SetSepChar( const chtype colSepchar )  { myPad()->SetSepChar( colSepchar ); }
-    void SetSepWidht( const unsigned sepwidth ) { myPad()->SetSepWidht( sepwidth ); }
+    void SetSepWidth( const unsigned sepwidth ) { myPad()->SetSepWidth( sepwidth ); }
     void SetHotCol( const int hcol )            { myPad()->SetHotCol( hcol ); }
 
     virtual void addItem( YItem *yitem );

Modified: trunk/ncurses/src/NCTableItem.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTableItem.cc?rev=46195&r1=46194&r2=46195&view=diff
==============================================================================
--- trunk/ncurses/src/NCTableItem.cc (original)
+++ trunk/ncurses/src/NCTableItem.cc Mon Apr  7 17:12:51 2008
@@ -279,7 +279,7 @@
   for ( unsigned c = 0; c < Cols(); ++c ) {
     if ( !Items[c] )
       continue;
-    tableStyle.MinColWidht( c, Items[c]->Size().W );
+    tableStyle.MinColWidth( c, Items[c]->Size().W );
   }
 }
 
@@ -328,36 +328,36 @@
     return;
 
   wrect    lRect( at );
-  unsigned destWidht;
+  unsigned destWidth;
 
   for ( unsigned c = 0; c < Cols(); ++c ) {
 
-    if ( c && tableStyle.ColSepwidht() ) {
+    if ( c && tableStyle.ColSepwidth() ) {
       // draw centered
-      destWidht = tableStyle.ColSepwidht()/2;
-      if ( destWidht < (unsigned)lRect.Sze.W ) {
+      destWidth = tableStyle.ColSepwidth()/2;
+      if ( destWidth < (unsigned)lRect.Sze.W ) {
 	w.bkgdset( tableStyle.getBG( vstate, NCTableCol::SEPARATOR ) );
-	w.vline( lRect.Pos.L, lRect.Pos.C + destWidht,
+	w.vline( lRect.Pos.L, lRect.Pos.C + destWidth,
 		 lRect.Sze.H, tableStyle.ColSepchar() );
 	// skip over
-	destWidht = tableStyle.ColSepwidht();
-	if ( (unsigned)lRect.Sze.W <= destWidht )
+	destWidth = tableStyle.ColSepwidth();
+	if ( (unsigned)lRect.Sze.W <= destWidth )
 	  break;
-	lRect.Pos.C += destWidht;
-	lRect.Sze.W -= destWidht;
+	lRect.Pos.C += destWidth;
+	lRect.Sze.W -= destWidth;
       }
     }
 
-    destWidht = tableStyle.ColWidht( c );
+    destWidth = tableStyle.ColWidth( c );
     wrect cRect( lRect );
     // adjust remaining linespace
-    lRect.Pos.C += destWidht;
-    lRect.Sze.W -= destWidht;
+    lRect.Pos.C += destWidth;
+    lRect.Sze.W -= destWidth;
     // adjust destinated width
     if ( lRect.Sze.W < 0 )
-      cRect.Sze.W = destWidht + lRect.Sze.W;
+      cRect.Sze.W = destWidth + lRect.Sze.W;
     else
-      cRect.Sze.W = destWidht;
+      cRect.Sze.W = destWidth;
     // draw item
     if ( Items[c] ) {
       Items[c]->DrawAt( w, cRect, tableStyle, vstate, c );
@@ -433,10 +433,10 @@
 //
 NCTableStyle::NCTableStyle( const NCWidget & p )
     : headline( 0 )
-    , colWidht( 0 )
+    , colWidth( 0 )
     , colAdjust( 0 )
     , parw( p )
-    , colSepwidht( 1 )
+    , colSepwidth( 1 )
     , colSepchar ( ACS_VLINE )
     , hotCol( (unsigned)-1 )
 {
@@ -457,7 +457,7 @@
   headline.ClearLine();
   headline.SetCols( ncols );
 
-  colWidht.clear();
+  colWidth.clear();
   colAdjust.clear();
   AssertMinCols( ncols );
 
@@ -586,9 +586,9 @@
 ostream & operator<<( ostream & STREAM, const NCTableStyle & OBJ )
 {
   STREAM << form( "cols %d, sep %d (%lx)\n",
-		  OBJ.Cols(), OBJ.ColSepwidht(), OBJ.ColSepchar() );
+		  OBJ.Cols(), OBJ.ColSepwidth(), OBJ.ColSepchar() );
   for( unsigned i = 0; i < OBJ.Cols(); ++i ) {
-    STREAM << form( "%2d %d(%3d) ", i, OBJ.ColAdjust( i ), OBJ.ColWidht( i ) );
+    STREAM << form( "%2d %d(%3d) ", i, OBJ.ColAdjust( i ), OBJ.ColWidth( i ) );
     if ( OBJ.Headline().GetCol( i ) )
       STREAM << OBJ.Headline().GetCol( i )->Label();
     STREAM << endl;

Modified: trunk/ncurses/src/NCTableItem.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTableItem.h?rev=46195&r1=46194&r2=46195&view=diff
==============================================================================
--- trunk/ncurses/src/NCTableItem.h (original)
+++ trunk/ncurses/src/NCTableItem.h Mon Apr  7 17:12:51 2008
@@ -219,12 +219,12 @@
   private:
 
     NCTableHead         headline;
-    vector<unsigned>    colWidht;
+    vector<unsigned>    colWidth;
     vectorNC::ADJUST  colAdjust;
 
     const NCWidget & parw;
 
-    unsigned colSepwidht;
+    unsigned colSepwidth;
     chtype   colSepchar;
     unsigned hotCol;
 
@@ -237,35 +237,35 @@
 
     bool SetStyleFrom( const vector<NCstring> & head );
     void SetSepChar( const chtype sepchar )     { colSepchar = sepchar; }
-    void SetSepWidht( const unsigned sepwidth ) { colSepwidht = sepwidth; }
+    void SetSepWidth( const unsigned sepwidth ) { colSepwidth = sepwidth; }
     void SetHotCol( const int hcol )            {
       hotCol = (hcol < 0 || Cols() <= (unsigned)hcol) ? -1 : hcol;
     }
 
     void ResetToMinCols() {
-      colWidht.clear();
+      colWidth.clear();
       AssertMinCols( headline.Cols() );
       headline.UpdateFormat( *this );
     }
 
     void AssertMinCols( unsigned num ) {
-      if ( colWidht.size() < num ) {
-	colWidht.resize( num, 0 );
-	colAdjust.resize( colWidht.size(), NC::LEFT );
+      if ( colWidth.size() < num ) {
+	colWidth.resize( num, 0 );
+	colAdjust.resize( colWidth.size(), NC::LEFT );
       }
     }
 
-    void MinColWidht( unsigned num, unsigned val ) {
+    void MinColWidth( unsigned num, unsigned val ) {
       AssertMinCols( num );
-      if ( val > colWidht[num] )
-	colWidht[num] = val;
+      if ( val > colWidth[num] )
+	colWidth[num] = val;
     }
 
     NC::ADJUST ColAdjust( unsigned num ) const { return colAdjust[num]; }
 
-    unsigned Cols()                   const { return colWidht.size(); }
-    unsigned ColWidht( unsigned num ) const { return colWidht[num]; }
-    unsigned ColSepwidht()            const { return colSepwidht; }
+    unsigned Cols()                   const { return colWidth.size(); }
+    unsigned ColWidth( unsigned num ) const { return colWidth[num]; }
+    unsigned ColSepwidth()            const { return colSepwidth; }
     chtype   ColSepchar()             const { return colSepchar; }
     unsigned HotCol()                 const { return hotCol; }
 
@@ -289,9 +289,9 @@
     unsigned TableWidth() const {
       unsigned twidth = 0;
       for( unsigned i = 0; i < Cols(); ++i )
-	twidth += colWidht[i];
+	twidth += colWidth[i];
       if ( Cols() > 1 )
-	twidth += colSepwidht * (Cols()-1);
+	twidth += colSepwidth * (Cols()-1);
       return twidth;
     }
 };

Modified: trunk/ncurses/src/NCTablePad.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTablePad.h?rev=46195&r1=46194&r2=46195&view=diff
==============================================================================
--- trunk/ncurses/src/NCTablePad.h (original)
+++ trunk/ncurses/src/NCTablePad.h Mon Apr  7 17:12:51 2008
@@ -98,8 +98,8 @@
     void SetSepChar( const chtype colSepchar ) {
       ItemStyle.SetSepChar( colSepchar );
     }
-    void SetSepWidht( const unsigned sepwidth ) {
-      ItemStyle.SetSepWidht( sepwidth );
+    void SetSepWidth( const unsigned sepwidth ) {
+      ItemStyle.SetSepWidth( sepwidth );
     }
     void SetHotCol( const int hcol ) {
       ItemStyle.SetHotCol( hcol );

Modified: trunk/ncurses/src/NCTextPad.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTextPad.cc?rev=46195&r1=46194&r2=46195&view=diff
==============================================================================
--- trunk/ncurses/src/NCTextPad.cc (original)
+++ trunk/ncurses/src/NCTextPad.cc Mon Apr  7 17:12:51 2008
@@ -93,12 +93,12 @@
 ///////////////////////////////////////////////////////////////////
 //
 //
-//	METHOD NAME : NCTextPad::assertWidht
+//	METHOD NAME : NCTextPad::assertWidth
 //	METHOD TYPE : void
 //
 //	DESCRIPTION :
 //
-void NCTextPad::assertWidht( unsigned minw )
+void NCTextPad::assertWidth( unsigned minw )
 {
   if ( minw >= (unsigned)width() ) // == for the '\n'
     resize( wsze( height(), minw + 10 ) );
@@ -347,7 +347,7 @@
     return false;
   }
 
-  assertWidht( ++(*cline) );
+  assertWidth( ++(*cline) );
   cchar_t cchar;
   attr_t attr;
   short int color;
@@ -440,7 +440,7 @@
     (*cline) += (*nextl);
     lines.erase( nextl );
 
-    assertWidht( (*cline) );
+    assertWidth( (*cline) );
     copywin( *this, curs.L+1, 0, curs.L, curs.C, curs.L, (*cline), false );
 
     move( curs.L+1, 0 );

Modified: trunk/ncurses/src/NCTextPad.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTextPad.h?rev=46195&r1=46194&r2=46195&view=diff
==============================================================================
--- trunk/ncurses/src/NCTextPad.h (original)
+++ trunk/ncurses/src/NCTextPad.h Mon Apr  7 17:12:51 2008
@@ -58,7 +58,7 @@
     bool openLine();
 
     void assertSze( wsze minsze );
-    void assertWidht ( unsigned minw );
+    void assertWidth ( unsigned minw );
     void assertHeight( unsigned minh );
 
     // specifies how much characters can be inserted. -1 for unlimited input

Modified: trunk/ncurses/src/NCTree.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTree.cc?rev=46195&r1=46194&r2=46195&view=diff
==============================================================================
--- trunk/ncurses/src/NCTree.cc (original)
+++ trunk/ncurses/src/NCTree.cc Mon Apr  7 17:12:51 2008
@@ -279,7 +279,7 @@
 //
 int NCTree::preferredWidth()
 {
-    wsze sze = wsze::max( defsze, wsze( 0, labelWidht()+2 ) ); 
+    wsze sze = wsze::max( defsze, wsze( 0, labelWidth()+2 ) ); 
     return sze.W; 
 }
 
@@ -294,7 +294,7 @@
 //
 int NCTree::preferredHeight()
 {
-    wsze sze = wsze::max( defsze, wsze( 0, labelWidht()+2 ) );
+    wsze sze = wsze::max( defsze, wsze( 0, labelWidth()+2 ) );
     return sze.H;
 }
 

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r46195 - in /trunk/ncurses: ./ package/ src/

tgoettlicher＠svn.opensuse.org