Author: sh-sh-sh Date: Fri Jun 6 18:26:31 2008 New Revision: 48132 URL: http://svn.opensuse.org/viewcvs/yast?rev=48132&view=rev Log: excessive blank lines Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBox.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCComboBox.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFileSelection.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCInputField.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCIntField.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMenuButton.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMultiSelectionBox.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPad.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPadWidget.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupMenu.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPushButton.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRichText.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSelectionBox.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCStyleDef.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTable.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTableItem.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTextPad.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTree.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTreePad.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCattribute.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtoY2Event.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtypes.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCurses.cc Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBox.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBox.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBox.cc Fri Jun 6 18:26:31 2008 @@ -88,7 +88,6 @@ { switch ( state ) { - case YCheckBox_on: checkstate = S_ON; tristate = false; @@ -149,7 +148,6 @@ switch ( key ) { - case KEY_HOTKEY: case KEY_SPACE: @@ -158,7 +156,6 @@ switch ( checkstate ) { - case S_DC: checkstate = S_ON; break; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCComboBox.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCComboBox.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCComboBox.cc Fri Jun 6 18:26:31 2008 @@ -443,7 +443,6 @@ switch ( key ) { - case KEY_BACKSPACE: if ( mayedit && curpos ) Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.cc Fri Jun 6 18:26:31 2008 @@ -124,7 +124,6 @@ { switch ( defsze.H ) { - case 1: case 2: @@ -138,7 +137,6 @@ switch ( defsze.W ) { - case 1: case 2: @@ -350,7 +348,6 @@ { switch ( NCurses::lines() - panrect.Sze.H ) { - case 0: break; @@ -367,7 +364,6 @@ switch ( NCurses::cols() - panrect.Sze.W ) { - case 0: break; @@ -728,9 +724,7 @@ { switch ( c->Value()->GetState() ) { - case NC::WSnormal: - case NC::WSactive: if ( c->Value()->HasHotkey( key ) @@ -1118,8 +1112,7 @@ switch ( ch ) { - - // case KEY_RESIZE: is directly handled in NCDialog::getch. + // case KEY_RESIZE: is directly handled in NCDialog::getch. case WEOF: @@ -1144,7 +1137,6 @@ switch ( hch ) { - case 'D': yuiMilestone() << "CTRL('D')-'D' DUMP+++++++++++++++++++++" << endl; NCurses::ScreenShot(); @@ -1200,7 +1192,6 @@ switch ( hch ) { - case WEOF: // no 2nd char, handle ch if ( helpPopup ) @@ -1305,30 +1296,6 @@ noUpdates = false; -#if 0 // handled in get...Event - - switch ( pendingEvent.type ) - { - - case NCursesEvent::handled: - - case NCursesEvent::none: - - case NCursesEvent::cancel: - - case NCursesEvent::timeout: - pendingEvent.widget = 0; - break; - - case NCursesEvent::button: - - case NCursesEvent::menu: - pendingEvent.widget = wActive; - break; - } - -#endif - yuiDebug() << "process- " << this << " active " << wActive << endl; } Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFileSelection.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFileSelection.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFileSelection.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFileSelection.cc Fri Jun 6 18:26:31 2008 @@ -298,7 +298,6 @@ switch ( tableType ) { - case T_Overview: { data.reserve( 2 ); @@ -340,7 +339,6 @@ switch ( tableType ) { - case T_Overview: { data.reserve( 2 ); @@ -443,7 +441,6 @@ switch ( tableType ) { - case T_Overview: { header.reserve( 2 ); @@ -517,7 +514,6 @@ switch ( key ) { - case KEY_LEFT: ret.keySymbol = "CursorLeft"; break; @@ -550,17 +546,11 @@ switch ( key ) { - case KEY_UP: - case KEY_PPAGE: - case KEY_HOME: - case KEY_DOWN: - case KEY_NPAGE: - case KEY_END: { ret = NCursesEvent::SelectionChanged; @@ -687,7 +677,6 @@ switch ( tableType ) { - case T_Overview: { header.reserve( 2 ); @@ -823,11 +812,8 @@ switch ( key ) { - case KEY_UP: - case KEY_PPAGE: - case KEY_HOME: { if ( old_pos != 0 ) @@ -841,9 +827,7 @@ } case KEY_DOWN: - case KEY_NPAGE: - case KEY_END: { setCurrentDir(); @@ -853,7 +837,6 @@ } case KEY_RETURN: - case KEY_SPACE: { setCurrentDir(); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCInputField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCInputField.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCInputField.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCInputField.cc Fri Jun 6 18:26:31 2008 @@ -372,7 +372,6 @@ switch ( key ) { - case KEY_BACKSPACE: if ( bufferFull() && curpos == maxCursor() ) @@ -505,25 +504,15 @@ { switch ( key ) { - case L'0': - case L'1': - case L'2': - case L'3': - case L'4': - case L'5': - case L'6': - case L'7': - case L'8': - case L'9': if ( curpos || buffer.empty() || buffer[0] != L'-' ) Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCIntField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCIntField.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCIntField.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCIntField.cc Fri Jun 6 18:26:31 2008 @@ -264,7 +264,6 @@ switch ( key ) { - case KEY_UP: beep = !Increment(); break; @@ -299,25 +298,15 @@ break; case L'0': - case L'1': - case L'2': - case L'3': - case L'4': - case L'5': - case L'6': - case L'7': - case L'8': - case L'9': - case L'-': enterPopup( key ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMenuButton.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMenuButton.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMenuButton.cc Fri Jun 6 18:26:31 2008 @@ -72,13 +72,9 @@ switch ( key ) { - case KEY_HOTKEY: - case KEY_SPACE: - case KEY_RETURN: - case KEY_DOWN: ret = postMenu(); break; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMultiSelectionBox.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMultiSelectionBox.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMultiSelectionBox.cc Fri Jun 6 18:26:31 2008 @@ -244,7 +244,6 @@ switch ( key ) { - case KEY_SPACE: case KEY_RETURN: Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPad.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPad.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPad.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPad.cc Fri Jun 6 18:26:31 2008 @@ -126,7 +126,6 @@ switch ( key ) { - case KEY_UP: ScrlUp(); break; @@ -152,13 +151,11 @@ break; case KEY_LEFT: - case KEY_SLEFT: ScrlLeft(); break; case KEY_RIGHT: - case KEY_SRIGHT: ScrlRight(); break; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPadWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPadWidget.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPadWidget.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPadWidget.cc Fri Jun 6 18:26:31 2008 @@ -132,7 +132,6 @@ switch ( len ) { - case 1: win->bkgdset( style.scrl ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupMenu.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupMenu.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupMenu.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupMenu.cc Fri Jun 6 18:26:31 2008 @@ -65,7 +65,6 @@ switch ( ch ) { - case KEY_RIGHT: { yuiMilestone() << "CurrentItem: " << getCurrentItem() << endl; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPushButton.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPushButton.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPushButton.cc Fri Jun 6 18:26:31 2008 @@ -80,9 +80,7 @@ switch ( key ) { - case KEY_HOTKEY: - case KEY_RETURN: ret = NCursesEvent::Activated; break; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRichText.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRichText.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRichText.cc Fri Jun 6 18:26:31 2008 @@ -261,9 +261,7 @@ { switch ( key ) { - case KEY_SPACE: - case KEY_RETURN: if ( armed != Anchor::unset ) @@ -430,18 +428,13 @@ { switch ( *wch ) { - case L' ': - case L'\t': - case L'\n': - case L'\v': - case L'\r': - if ( !preTag ) + if ( ! preTag ) { SkipWS( wch ); PadWS(); @@ -487,9 +480,7 @@ } PadBOL(); - AdjustPad( wsze( cl, textwidth ) ); - yuiDebug() << "Anchors: " << anchors.size() << endl; for ( unsigned i = 0; i < anchors.size(); ++i ) @@ -609,7 +600,6 @@ { switch ( Tattr & Tfontmask ) { - case T_BOLD: nbg = style.B; break; @@ -692,9 +682,7 @@ switch ( c ) { - case L'\t': - case L' ': if ( *lookup != L' ' ) @@ -801,10 +789,9 @@ switch ( value.length() ) { - case 1: - if ( value[0] == 'b' ) token = T_BOLD; + if ( value[0] == 'b' ) token = T_BOLD; else if ( value[0] == 'i' ) token = T_IT; else if ( value[0] == 'p' ) token = T_PAR; else if ( value[0] == 'a' ) token = T_ANC; @@ -813,7 +800,7 @@ break; case 2: - if ( value == L"br" ) token = T_BR; + if ( value == L"br" ) token = T_BR; else if ( value == L"em" ) token = T_IT; else if ( value == L"h1" ) { token = T_HEAD; headinglevel = 1; } else if ( value == L"h2" ) { token = T_HEAD; headinglevel = 2; } @@ -829,26 +816,26 @@ case 3: - if ( value == L"big" ) token = T_IGNORE; + if ( value == L"big" ) token = T_IGNORE; else if ( value == L"pre" ) token = T_PLAIN; break; case 4: - if ( value == L"bold" ) token = T_BOLD; + if ( value == L"bold" ) token = T_BOLD; else if ( value == L"code" ) token = T_TT; else if ( value == L"font" ) token = T_IGNORE; break; case 5: - if ( value == L"large" ) token = T_IGNORE; + if ( value == L"large" ) token = T_IGNORE; else if ( value == L"small" ) token = T_IGNORE; break; case 6: - if ( value == L"center" ) token = T_PAR; + if ( value == L"center" ) token = T_PAR; else if ( value == L"strong" ) token = T_BOLD; break; @@ -867,8 +854,8 @@ if ( token == T_UNKNOWN ) { yuiDebug() << "T_UNKNOWN :" << value << ":" << args << ":" << endl; -// see bug #67319 -// return false; + // see bug #67319 + // return false; return true; } @@ -877,7 +864,6 @@ switch ( token ) { - case T_LEVEL: PadChangeLevel( endtag, leveltag ); PadBOL(); @@ -900,7 +886,6 @@ Tattr |= token; PadSetAttr(); - PadBOL(); if ( headinglevel && endtag ) @@ -987,9 +972,7 @@ // fall through case T_BOLD: - case T_IT: - case T_TT: if ( endtag ) Tattr &= ~token; @@ -1001,7 +984,6 @@ break; case T_IGNORE: - case T_UNKNOWN: break; } @@ -1113,7 +1095,6 @@ switch ( key ) { - case KEY_LEFT: // jump to previous link; scroll up if none { Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSelectionBox.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSelectionBox.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSelectionBox.cc Fri Jun 6 18:26:31 2008 @@ -201,7 +201,6 @@ switch ( key ) { - case KEY_LEFT: ret.keySymbol = "CursorLeft"; break; @@ -223,9 +222,7 @@ switch ( key ) { - case KEY_SPACE: - case KEY_RETURN: if ( notify() && citem != -1 ) Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCStyleDef.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCStyleDef.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCStyleDef.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCStyleDef.cc Fri Jun 6 18:26:31 2008 @@ -119,18 +119,18 @@ switch ( a ) { - PRT( Global ); - PRT( DialogBorder ); - PRT( DialogBorderActive ); - PRT( DialogText ); - PRT( Widget ); - PRT( WidgetActive ); - PRT( FrameWidget ); - PRT( FrameWidgetActive ); - PRT( List ); - PRT( ListActive ); - PRT( RichText ); - PRT( ProgressBar ); + PRT( Global ); + PRT( DialogBorder ); + PRT( DialogBorderActive ); + PRT( DialogText ); + PRT( Widget ); + PRT( WidgetActive ); + PRT( FrameWidget ); + PRT( FrameWidgetActive ); + PRT( List ); + PRT( ListActive ); + PRT( RichText ); + PRT( ProgressBar ); case MaxSetType: break; @@ -220,7 +220,6 @@ { switch ( c ) { - case -1: return "-1"; break; @@ -261,10 +260,10 @@ return "??"; } - /////////////////////////////////////////////////////////////////// - // SubWin: base class for the windows used - /////////////////////////////////////////////////////////////////// + /** + * SubWin: base class for the windows used + **/ struct SubWin { static const int taglen = 7; @@ -311,34 +310,21 @@ { switch (( in = getch() ) ) { - case -1: - case KEY_ESC: - case KEY_TAB: - case KEY_RETURN: in = -1; // no reconsume case KEY_F( 1 ): - case KEY_F( 2 ): - case KEY_F( 3 ): - case KEY_F( 4 ): - case KEY_F( 5 ): - case KEY_F( 6 ): - case KEY_F( 7 ): - case KEY_F( 8 ): - case KEY_F( 9 ): - case KEY_F( 10 ): continue_bi = false; break; @@ -374,10 +360,10 @@ } }; - /////////////////////////////////////////////////////////////////// - // Wstyle: Selection of the current NCstyle::StyleSet to process - /////////////////////////////////////////////////////////////////// + /** + * Wstyle: Selection of the current NCstyle::StyleSet to process + **/ struct Wstyle : public SubWin { NCstyle::StyleSet cset; @@ -405,7 +391,6 @@ { switch ( in ) { - case KEY_UP: if ( cset > 0 ) @@ -414,7 +399,6 @@ draw( true ); fakestyle( cset ); } - break; case KEY_DOWN: @@ -425,16 +409,15 @@ draw( true ); fakestyle( cset ); } - break; } } }; - /////////////////////////////////////////////////////////////////// - // Wset: Selection of the current attribute set to process - /////////////////////////////////////////////////////////////////// + /** + * Wset: Selection of the current attribute set to process + **/ struct Wset : public SubWin { SetType cset; @@ -462,7 +445,6 @@ { switch ( in ) { - case KEY_UP: if ( cset > 0 ) @@ -488,10 +470,10 @@ } }; - /////////////////////////////////////////////////////////////////// - // Wchattr: handle modification of the current attribute set. - /////////////////////////////////////////////////////////////////// + /** + * Wchattr: handle modification of the current attribute set. + **/ struct Wchattr : public SubWin { vector<Aset> aset; @@ -521,7 +503,6 @@ switch ( in ) { - case KEY_UP: if ( citem ) @@ -543,7 +524,6 @@ break; case KEY_LEFT: - case KEY_RIGHT: movepad( in ); break; @@ -565,13 +545,11 @@ break; case KEY_IC: - case 'b': aset[citem].toggleStyle( A_BOLD ); break; case KEY_DC: - case 'n': aset[citem].setStyle( A_NORMAL ); break; @@ -701,10 +679,10 @@ } }; - /////////////////////////////////////////////////////////////////// - // Wchstat: show current attributes definition - /////////////////////////////////////////////////////////////////// + /** + * Wchstat: show current attributes definition + **/ struct Wchstat : public SubWin { Wchstat( string T, NCursesWindow & P, int H, int W, int L, int C ) @@ -749,10 +727,10 @@ } }; - /////////////////////////////////////////////////////////////////// - // Wex: popup and down the example Dialog - /////////////////////////////////////////////////////////////////// + /** + * Wex: popup and down the example Dialog + **/ struct Wex : public SubWin { SetType cset; @@ -776,11 +754,11 @@ } }; - /////////////////////////////////////////////////////////////////// + // // Construct the panel and widgets // - /////////////////////////////////////////////////////////////////// + Wstyle wStyle; Wset wSet; Wchstat wChstat; @@ -807,16 +785,8 @@ ~NCStyleDef() { NCStyleDef_p = 0; } - /////////////////////////////////////////////////////////////////// - // changeStyle - /////////////////////////////////////////////////////////////////// - void changeStyle(); - /////////////////////////////////////////////////////////////////// - // saveStyle - /////////////////////////////////////////////////////////////////// - void saveStyle(); // that's the way the chtype is saved to file @@ -838,14 +808,12 @@ return str; } - /////////////////////////////////////////////////////////////////// - // restoreStyle - /////////////////////////////////////////////////////////////////// - void restoreStyle(); - // helper struct to map strings to NCstyle enum values + /** + * helper struct to map strings to NCstyle enum values + **/ struct lookupIdx { NCstyle::STglobal glob; @@ -867,10 +835,6 @@ const char * stat() const { if ( isLoc() ) return "L"; return isGlob() ? "G" : "?"; } }; - /////////////////////////////////////////////////////////////////// - // showHelp - /////////////////////////////////////////////////////////////////// - void showHelp(); }; @@ -1033,14 +997,12 @@ switch ( in ) { - case KEY_UP: if ( p.begy() > 0 ) { p.mvwin( p.begy() - 1, p.begx() ); } - break; case KEY_DOWN: @@ -1049,7 +1011,6 @@ { p.mvwin( p.begy() + 1, p.begx() ); } - break; case KEY_LEFT: @@ -1058,7 +1019,6 @@ { p.mvwin( p.begy(), p.begx() - 1 ); } - break; case KEY_RIGHT: @@ -1067,35 +1027,21 @@ { p.mvwin( p.begy(), p.begx() + 1 ); } - break; case -1: - case KEY_ESC: - case KEY_TAB: - case KEY_RETURN: - case KEY_F( 1 ): - case KEY_F( 2 ): - case KEY_F( 3 ): - case KEY_F( 4 ): - case KEY_F( 5 ): - case KEY_F( 6 ): - case KEY_F( 7 ): - case KEY_F( 8 ): - case KEY_F( 9 ): - case KEY_F( 10 ): continue_bi = false; break; @@ -1139,7 +1085,6 @@ switch ( in ) { - case KEY_F( 1 ): wStyle.handle( KEY_UP ); break; @@ -1173,7 +1118,6 @@ break; case KEY_ESC: - case KEY_F( 10 ): continue_bi = false; break; @@ -1181,7 +1125,6 @@ default: rein = wChattr.change(); break; - } } while ( continue_bi ); @@ -1273,20 +1216,19 @@ popup.refresh(); - switch (( in = getch() ) ) + switch ( ( in = getch() ) ) { case KEY_UP: if ( idx ) --idx; - break; case KEY_DOWN: + if ( idx + 1 < men.size() ) ++idx; - break; case KEY_RETURN: @@ -1296,13 +1238,11 @@ in = -1; break; - } } while ( in != -1 ); popup.hide(); - popup.refresh(); return ret; @@ -1324,22 +1264,17 @@ W = wi; w.vline( l, c, H ); - w.vline( l, c + W, H ); - w.hline( l, c, W ); - w.hline( l + H, c, W ); w.addch( l, c, ACS_ULCORNER ); - w.addch( l + H, c, ACS_LLCORNER ); - w.addch( l, c + W, ACS_URCORNER ); - w.addch( l + H, c + W, ACS_LRCORNER ); } + inline void laex( NCursesWindow & W, const char * T, NCstyle::StItem st ) { BGSET( hint ); @@ -1348,6 +1283,7 @@ W.addstr( T + 1 ); } + inline void itex( NCursesWindow & W, const char * T, NCstyle::StItem st ) { BGSET( plain ); @@ -1359,6 +1295,7 @@ laex( W, T, st ); } + inline void butex( NCursesWindow & W, int L, int C, const char * T, NCstyle::StWidget st ) { W.move( L, C ); @@ -1367,6 +1304,7 @@ W.addch( ACS_DARROW ); } + inline void frameex( NCursesWindow & W, int L, int C, const char * T, NCstyle::StWidget st ) { BGSET( plain ); @@ -1381,6 +1319,7 @@ W.addch( L + 2, C + wi, ACS_BTEE ); } + inline void listex( NCursesWindow & W, int L, int C, NCstyle::StList st ) { BGSET( title ); @@ -1397,6 +1336,7 @@ itex( W, "Selected", st.selected ); } + inline void widex( NCursesWindow & W, int L, int C, const char * T, NCstyle::StWidget w, NCstyle::StWidget f, NCstyle::StList l ) { @@ -1438,82 +1378,45 @@ const NCstyle::Style & st( NCStyleDef_p->NCstyle_C.getStyle( NCStyleDef_p->NCstyle_C.fakestyle_e ) ); BGSET( dumb.text ); - W.clear(); - BGSET( border.text ); - W.box(); - BGSET( border.title ); - W.addstr( 0, 1, "normal dialog" ); - int l = 1; - int c = 1; - BGSET( activeBorder.text ); - frame( W, l, c, W.height() - 2, W.width() - 2 ); - BGSET( activeBorder.title ); - W.addstr( l, c + 1, "active dialog" ); - l = 3; - c = 3; - BGSET( dumb.title ); - W.addstr( l, c, "Heading" ); - BGSET( dumb.text ); - frame( W, l + 2, c ); - W.addstr( l + 2, c + 1, "Frame" ); - W.addstr( l + 4, c + 1, "Some text" ); - c += 20; - widex( W, l, c, "Disabled", st.disabled, st.disabled, st.disabledList ); - c += 20; - widex( W, l, c, "Normal", st.normal, st.frame, st.list ); - c += 20; - widex( W, l, c, "Active", st.active, st.activeFrame, st.activeList ); - l += hi + 4; - c = 3; - BGSET( progbar.bar.chattr ); - W.addstr( l, c, " " ); - BGSET( progbar.bar.getNonChar() ); - W.addstr( "50" ); - BGSET( progbar.nonbar.getNonChar() ); - W.addstr( "%" ); - BGSET( progbar.nonbar.chattr ); - W.addstr( " " ); - W.refresh(); } - void NCStyleDef::saveStyle() { string fname( "NCstyle." + NCstyle_C.styleName + ".h" ); @@ -1584,7 +1487,6 @@ } out << " //=================================================================" << endl; - out << " // init local attributes" << endl; out << " //=================================================================" << endl; @@ -1604,12 +1506,10 @@ } out << "}" << endl; - out << "#endif // " << hname << endl; - out.close(); - if ( !out.good() ) + if ( ! out.good() ) { p.bkgd( NCattribute::color_pair( COLOR_WHITE, COLOR_RED ) ); p.printw( " FAILED!" ); @@ -1629,7 +1529,6 @@ } - void NCStyleDef::restoreStyle() { string fname( "NCstyle." + NCstyle_C.styleName + ".h" ); @@ -1688,7 +1587,6 @@ switch ( psaw ) { - case PRE: if ( line.find( initfnc_ti ) == 0 ) Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTable.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTable.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTable.cc Fri Jun 6 18:26:31 2008 @@ -24,13 +24,6 @@ #include "YTypes.h" -#if 0 -#undef DBG_CLASS -#define DBG_CLASS "_NCTable_" -#endif - - - NCTable::NCTable( YWidget * parent, YTableHeader *tableHeader ) : YTable( parent, tableHeader ) , NCPadWidget( parent ) @@ -127,9 +120,9 @@ -// Set alignment of i-th table column (left, right, -// center). Create temp. header consisting of single -// letter - setHeader will append the rest +// Set alignment of i-th table column (left, right, center). +// Create temp. header consisting of single letter; +// setHeader will append the rest. void NCTable::setAlignment( int col, YAlignmentType al ) { @@ -137,7 +130,6 @@ switch ( al ) { - case YAlignUnchanged: s = 'L' ; break; @@ -161,7 +153,7 @@ // Append item (as pointed to by 'yitem') to a table -// (create new table line consisting of individual cells) +// (create new table line consisting of individual cells) void NCTable::addItem( YItem *yitem ) { @@ -374,9 +366,9 @@ -// Handle 'special' keys i.e those not handled -// by parent NCPad class (space, return). Set -// items to selected, if appropriate +// Handle 'special' keys i.e those not handled by parent NCPad class +// (space, return). Set items to selected, if appropriate. + NCursesEvent NCTable::wHandleInput( wint_t key ) { NCursesEvent ret; @@ -386,7 +378,6 @@ { switch ( key ) { - case CTRL( 'o' ): { // get the column @@ -424,7 +415,6 @@ } case KEY_SPACE: - case KEY_RETURN: if ( notify() && citem != -1 ) Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTableItem.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTableItem.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTableItem.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTableItem.cc Fri Jun 6 18:26:31 2008 @@ -356,7 +356,7 @@ colAdjust.clear(); AssertMinCols( ncols ); - bool hascontent = false; + bool hasContent = false; for ( unsigned i = 0; i < head.size(); ++i ) { @@ -367,7 +367,6 @@ { switch ( entry[0] ) { - case 'R': strip = true; colAdjust[i] = NC::RIGHT; @@ -389,16 +388,14 @@ } } - NCstring coltxt; - - coltxt = strip ? entry.substr( 1 ) : entry; + NCstring coltxt = strip ? entry.substr( 1 ) : entry; headline.AddCol( i, new NCTableCol( coltxt ) ); - if ( !hascontent && coltxt.str().length() ) - hascontent = true; + if ( ! hasContent && coltxt.str().length() ) + hasContent = true; } - return hascontent; + return hasContent; } @@ -425,12 +422,10 @@ { switch ( lstate ) { - case NCTableLine::S_NORMAL: switch ( cstyle ) { - case NCTableCol::PLAIN: return listStyle().item.plain; @@ -449,14 +444,13 @@ case NCTableCol::NONE: return currentBG; } - break; + case NCTableLine::S_ACTIVE: switch ( cstyle ) { - case NCTableCol::PLAIN: return listStyle().selected.plain; @@ -475,14 +469,13 @@ case NCTableCol::NONE: return currentBG; } - break; + case NCTableLine::S_DISABELED: switch ( cstyle ) { - case NCTableCol::PLAIN: return parw.wStyle().disabledList.item.plain; @@ -501,9 +494,9 @@ case NCTableCol::NONE: return currentBG; } - break; + case NCTableLine::S_HEADLINE: return listStyle().title; break; @@ -511,7 +504,6 @@ case NCTableLine::S_HIDDEN: return currentBG; break; - } return currentBG; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTextPad.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTextPad.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTextPad.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTextPad.cc Fri Jun 6 18:26:31 2008 @@ -171,7 +171,6 @@ switch ( key ) { - case KEY_LEFT: if ( curs.C ) @@ -189,9 +188,9 @@ beep = true; update = false; } - break; + case KEY_UP: if ( curs.L ) @@ -204,9 +203,9 @@ beep = true; update = false; } - break; + case KEY_RIGHT: if (( unsigned )curs.C < ( *cline ) ) @@ -224,9 +223,9 @@ beep = true; update = false; } - break; + case KEY_DOWN: if (( unsigned )curs.L + 1 < lines.size() ) @@ -239,9 +238,9 @@ beep = true; update = false; } - break; + case KEY_PPAGE: if ( curs.L ) @@ -253,9 +252,9 @@ beep = true; update = false; } - break; + case KEY_NPAGE: if (( unsigned )curs.L + 1 < lines.size() ) @@ -267,27 +266,27 @@ beep = true; update = false; } - break; + case KEY_HOME: if ( curs.C ) { curs.C = 0; } - break; + case KEY_END: if (( unsigned )curs.C < ( *cline ) ) { curs.C = ( *cline ); } - break; + case KEY_BACKSPACE: beep = !delch( true ); break; @@ -312,7 +311,6 @@ { beep = !insert( key ); } - break; } Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTree.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTree.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTree.cc Fri Jun 6 18:26:31 2008 @@ -131,7 +131,6 @@ switch ( key ) { - case KEY_IC: if ( fchild->isVisible() ) @@ -146,10 +145,9 @@ break; case KEY_SPACE: -// case KEY_RETURN: - see bug 67350 + // case KEY_RETURN: see bug 67350 case '+': - case '-': break; @@ -471,16 +469,13 @@ { switch ( key ) { - - case KEY_SPACE: // KEY_SPACE is handled in NCTreeLine::handleInput - + case KEY_SPACE: // KEY_SPACE is handled in NCTreeLine::handleInput case KEY_RETURN: if ( notify() ) { return NCursesEvent::Activated; } - break; } } Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTreePad.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTreePad.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTreePad.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTreePad.cc Fri Jun 6 18:26:31 2008 @@ -361,24 +361,18 @@ switch ( key ) { - case KEY_UP: - case KEY_PPAGE: - case KEY_DOWN: - case KEY_NPAGE: //handle these in compatible way with other widgets (#251180) //jump to the first/last item case KEY_HOME: - case KEY_END: //scroll horizontally case KEY_RIGHT: - case KEY_LEFT: handled = NCPad::handleInput( key ); break; @@ -386,15 +380,11 @@ //use these for toggling pack/unpack the tree case '+': - case '-': - case KEY_IC: - case KEY_DC: - case KEY_SPACE: -// case KEY_RETURN: - see bug 67350 + // case KEY_RETURN: - see bug 67350 if ( visItems[citem.L]->handleInput( key ) ) { Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCattribute.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCattribute.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCattribute.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCattribute.cc Fri Jun 6 18:26:31 2008 @@ -354,7 +354,6 @@ { switch ( i ) { - case ATTRWARN: defInitSet( attribset[i], COLOR_BLACK, COLOR_RED ); scanLine( attribset[i], "NCAWdisabeled BLK . A_BOLD" ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.cc Fri Jun 6 18:26:31 2008 @@ -159,10 +159,10 @@ { switch ( a ) { - PRT( DefaultStyle ); - PRT( InfoStyle ); - PRT( WarnStyle ); - PRT( PopupStyle ); + PRT( DefaultStyle ); + PRT( InfoStyle ); + PRT( WarnStyle ); + PRT( PopupStyle ); case NCstyle::MaxStyleSet: break; @@ -175,8 +175,8 @@ { switch ( a ) { - PRT( AppTitle ); - PRT( AppText ); + PRT( AppTitle ); + PRT( AppText ); case NCstyle::MaxSTglobal: break; @@ -189,76 +189,76 @@ { switch ( a ) { - PRT( DialogBorder ); - PRT( DialogTitle ); - PRT( DialogActiveBorder ); - PRT( DialogActiveTitle ); - // - PRT( DialogText ); - PRT( DialogHeadline ); - // - PRT( DialogDisabled ); - // - PRT( DialogPlain ); - PRT( DialogLabel ); - PRT( DialogData ); - PRT( DialogHint ); - PRT( DialogScrl ); - PRT( DialogActivePlain ); - PRT( DialogActiveLabel ); - PRT( DialogActiveData ); - PRT( DialogActiveHint ); - PRT( DialogActiveScrl ); - // - PRT( DialogFramePlain ); - PRT( DialogFrameLabel ); - PRT( DialogFrameData ); - PRT( DialogFrameHint ); - PRT( DialogFrameScrl ); - PRT( DialogActiveFramePlain ); - PRT( DialogActiveFrameLabel ); - PRT( DialogActiveFrameData ); - PRT( DialogActiveFrameHint ); - PRT( DialogActiveFrameScrl ); - // - PRT( ListTitle ); - PRT( ListPlain ); - PRT( ListLabel ); - PRT( ListData ); - PRT( ListHint ); - PRT( ListSelPlain ); - PRT( ListSelLabel ); - PRT( ListSelData ); - PRT( ListSelHint ); - // - PRT( ListActiveTitle ); - PRT( ListActivePlain ); - PRT( ListActiveLabel ); - PRT( ListActiveData ); - PRT( ListActiveHint ); - PRT( ListActiveSelPlain ); - PRT( ListActiveSelLabel ); - PRT( ListActiveSelData ); - PRT( ListActiveSelHint ); - // - PRT( RichTextPlain ); - PRT( RichTextTitle ); - PRT( RichTextLink ); - PRT( RichTextArmedlink ); - PRT( RichTextActiveArmedlink ); - PRT( RichTextVisitedLink ); - PRT( RichTextB ); - PRT( RichTextI ); - PRT( RichTextT ); - PRT( RichTextBI ); - PRT( RichTextBT ); - PRT( RichTextIT ); - PRT( RichTextBIT ); - // - PRT( ProgbarCh ); - PRT( ProgbarBgch ); - // - PRT( TextCursor ); + PRT( DialogBorder ); + PRT( DialogTitle ); + PRT( DialogActiveBorder ); + PRT( DialogActiveTitle ); + // + PRT( DialogText ); + PRT( DialogHeadline ); + // + PRT( DialogDisabled ); + // + PRT( DialogPlain ); + PRT( DialogLabel ); + PRT( DialogData ); + PRT( DialogHint ); + PRT( DialogScrl ); + PRT( DialogActivePlain ); + PRT( DialogActiveLabel ); + PRT( DialogActiveData ); + PRT( DialogActiveHint ); + PRT( DialogActiveScrl ); + // + PRT( DialogFramePlain ); + PRT( DialogFrameLabel ); + PRT( DialogFrameData ); + PRT( DialogFrameHint ); + PRT( DialogFrameScrl ); + PRT( DialogActiveFramePlain ); + PRT( DialogActiveFrameLabel ); + PRT( DialogActiveFrameData ); + PRT( DialogActiveFrameHint ); + PRT( DialogActiveFrameScrl ); + // + PRT( ListTitle ); + PRT( ListPlain ); + PRT( ListLabel ); + PRT( ListData ); + PRT( ListHint ); + PRT( ListSelPlain ); + PRT( ListSelLabel ); + PRT( ListSelData ); + PRT( ListSelHint ); + // + PRT( ListActiveTitle ); + PRT( ListActivePlain ); + PRT( ListActiveLabel ); + PRT( ListActiveData ); + PRT( ListActiveHint ); + PRT( ListActiveSelPlain ); + PRT( ListActiveSelLabel ); + PRT( ListActiveSelData ); + PRT( ListActiveSelHint ); + // + PRT( RichTextPlain ); + PRT( RichTextTitle ); + PRT( RichTextLink ); + PRT( RichTextArmedlink ); + PRT( RichTextActiveArmedlink ); + PRT( RichTextVisitedLink ); + PRT( RichTextB ); + PRT( RichTextI ); + PRT( RichTextT ); + PRT( RichTextBI ); + PRT( RichTextBT ); + PRT( RichTextIT ); + PRT( RichTextBIT ); + // + PRT( ProgbarCh ); + PRT( ProgbarBgch ); + // + PRT( TextCursor ); case NCstyle::MaxSTlocal: break; @@ -272,10 +272,10 @@ NCstyle::NCstyle( string term_t ) - : styleName( "linux" ) - , term( term_t ) - , styleSet( MaxStyleSet ) - , fakestyle_e( MaxStyleSet ) + : styleName( "linux" ) + , term( term_t ) + , styleSet( MaxStyleSet ) + , fakestyle_e( MaxStyleSet ) { char *user_defined_style = getenv( "Y2NCURSES_COLOR_THEME" ); @@ -308,15 +308,15 @@ yuiMilestone() << "Init " << term_t << " using " << ( NCattribute::colors() ? "color" : "bw" ) - << " => " << MaxStyleSet << " styles in " << styleName << endl; + << " => " << MaxStyleSet << " styles in " << styleName << endl; #define IF_STYLE_INIT(n) if ( styleName == #n ) { NCstyleInit_##n( styleSet ); } IF_STYLE_INIT( linux ) - else IF_STYLE_INIT( xterm ) - else IF_STYLE_INIT( rxvt ) - else IF_STYLE_INIT( mono ) - else IF_STYLE_INIT( braille ) - else NCstyleInit_linux( styleSet ); + else IF_STYLE_INIT( xterm ) + else IF_STYLE_INIT( rxvt ) + else IF_STYLE_INIT( mono ) + else IF_STYLE_INIT( braille ) + else NCstyleInit_linux( styleSet ); } Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtoY2Event.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtoY2Event.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtoY2Event.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtoY2Event.cc Fri Jun 6 18:26:31 2008 @@ -48,8 +48,8 @@ { switch ( type ) { - // Note: libyui assumes ownership of YEvents, so they need to be - // created on the heap with 'new'. libyui takes care of deleting them. + // Note: libyui assumes ownership of YEvents, so they need to be + // created on the heap with 'new'. libyui takes care of deleting them. case button: @@ -77,7 +77,6 @@ return 0; case none: - case handled: return 0; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtypes.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtypes.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtypes.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtypes.cc Fri Jun 6 18:26:31 2008 @@ -32,15 +32,15 @@ switch ( obj ) { - PRT( CENTER ); - PRT( TOP ); - PRT( BOTTOM ); - PRT( LEFT ); - PRT( RIGHT ); - PRT( TOPLEFT ); - PRT( TOPRIGHT ); - PRT( BOTTOMLEFT ); - PRT( BOTTOMRIGHT ); + PRT( CENTER ); + PRT( TOP ); + PRT( BOTTOM ); + PRT( LEFT ); + PRT( RIGHT ); + PRT( TOPLEFT ); + PRT( TOPRIGHT ); + PRT( BOTTOMLEFT ); + PRT( BOTTOMRIGHT ); } return str << "NC::ADJUST"; @@ -55,10 +55,10 @@ switch ( obj ) { - PRT( WSdumb ); - PRT( WSnormal ); - PRT( WSactive ); - PRT( WSdisabeled ); + PRT( WSdumb ); + PRT( WSnormal ); + PRT( WSactive ); + PRT( WSdisabeled ); } return str << "NC::WState"; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCurses.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCurses.cc?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCurses.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCurses.cc Fri Jun 6 18:26:31 2008 @@ -114,13 +114,13 @@ switch ( OBJ.type ) { - ENUM_OUT( none ); - ENUM_OUT( handled ); - ENUM_OUT( cancel ); - ENUM_OUT( button ); - ENUM_OUT( menu ); - ENUM_OUT( timeout ); - ENUM_OUT( key ); + ENUM_OUT( none ); + ENUM_OUT( handled ); + ENUM_OUT( cancel ); + ENUM_OUT( button ); + ENUM_OUT( menu ); + ENUM_OUT( timeout ); + ENUM_OUT( key ); } #undef ENUM_OUT -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org