Author: sh-sh-sh Date: Fri Jun 6 18:37:22 2008 New Revision: 48133 URL: http://svn.opensuse.org/viewcvs/yast?rev=48133&view=rev Log: Removed dead code. That stuff was dead for so long that it didn't even stink any more. Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCInputField.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMenuButton.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupInfo.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSpacing.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTablePad.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCWidget.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/NCurses.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesw.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesw.h Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.cc?rev=48133&r1=48132&r2=48133&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.cc Fri Jun 6 18:37:22 2008 @@ -90,13 +90,9 @@ #if 0 signal( SIGALRM, NCBusyIndicatorHandlerWrapper ); - interval.it_value.tv_sec = 0; - interval.it_value.tv_usec = REPAINT_INTERVAL * 1000; - setitimer( ITIMER_REAL, &interval, NULL ); - #endif } 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=48133&r1=48132&r2=48133&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:37:22 2008 @@ -28,14 +28,10 @@ #include "ncursesw.h" -#if 0 -#undef DBG_CLASS -#define DBG_CLASS "_NCDialog_" -#endif /* Textdomain "ncurses" -*/ + */ static bool hiddenMenu() @@ -1221,7 +1217,6 @@ break; #if 0 - case KEY_F( 1 ): if ( !helpPopup ) @@ -1325,7 +1320,6 @@ NCursesEvent NCDialog::getHotkeyEvent( wint_t key ) { -// NCWidget *const oActive = wActive; NCursesEvent ret = NCursesEvent::none; if ( wActive->isValid() ) @@ -1334,14 +1328,6 @@ ret.widget = wActive; } -#if 0 // depends on kind of widget - if ( wActive != oActive ) - { - Activate( *oActive ); - } - -#endif - return ret; } 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=48133&r1=48132&r2=48133&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:37:22 2008 @@ -25,12 +25,6 @@ #include // iswalnum() -#if 0 -#undef DBG_CLASS -#define DBG_CLASS "_NCInputField_" -#endif - - NCInputField::NCInputField( YWidget * parent, const string & nlabel, 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=48133&r1=48132&r2=48133&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:37:22 2008 @@ -124,15 +124,6 @@ : win->addch( 0, win->maxx() - 1, ACS_DARROW ); } -#if 0 -void NCMenuButton::createMenu() -{ - YMenu * toplevel = getToplevelMenu(); - setEnabled( toplevel && toplevel->hasChildren() ); -} - -#endif - void NCMenuButton::rebuildMenuTree() Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupInfo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupInfo.cc?rev=48133&r1=48132&r2=48133&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupInfo.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupInfo.cc Fri Jun 6 18:37:22 2008 @@ -116,6 +116,7 @@ return postevent; } + void NCPopupInfo::popup() { initDialog(); @@ -124,6 +125,7 @@ visible = true; } + void NCPopupInfo::popdown() { activate( false ); @@ -131,25 +133,7 @@ visible = false; } -#if 0 -long NCPopupInfo::nicesize( YUIDimension dim ) -{ - long vertDim = vDim; - long horDim = hDim; - - if ( vDim >= NCurses::lines() ) - vertDim = NCurses::lines() - 5; - if ( hDim >= NCurses::cols() ) - horDim = NCurses::cols() - 10; - - return ( dim == YD_HORIZ ? horDim : vertDim ); -} - -#endif - - -// returns preferred horizontal size int NCPopupInfo::preferredWidth() { int horDim = hDim; @@ -161,8 +145,6 @@ } - -// returns preferred vertical size int NCPopupInfo::preferredHeight() { int vertDim = vDim; @@ -174,8 +156,8 @@ } - -NCursesEvent NCPopupInfo::wHandleInput( wint_t ch ) +NCursesEvent +NCPopupInfo::wHandleInput( wint_t ch ) { if ( ch == 27 ) // ESC return NCursesEvent::cancel; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSpacing.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSpacing.cc?rev=48133&r1=48132&r2=48133&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSpacing.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSpacing.cc Fri Jun 6 18:37:22 2008 @@ -31,36 +31,12 @@ , NCWidget( parent ) { yuiDebug() << endl; -#if 0 - if ( horizontal && vertical ) - { - l = "NC(B)Spacing"; - } - else if ( horizontal ) - { - l = "NC(H)Spacing"; - } - else if ( vertical ) - { - l = "NC(V)Spacing"; - } - else - { - l = "NC(N)Spacing"; - } - -#endif - - if ( dim == YD_VERT ) - l = "NC(V)Spacing"; - else if ( dim == YD_HORIZ ) - l = "NC(H)Spacing"; - else - l = "NC(N)Spacing"; + if ( dim == YD_VERT ) l = "NC(V)Spacing"; + else if ( dim == YD_HORIZ ) l = "NC(H)Spacing"; + else l = "NC(N)Spacing"; wstate = NC::WSdumb; - skipNoDimWin = true; } Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTablePad.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTablePad.cc?rev=48133&r1=48132&r2=48133&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTablePad.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTablePad.cc Fri Jun 6 18:37:22 2008 @@ -23,12 +23,6 @@ #include -#if 0 -#undef DBG_CLASS -#define DBG_CLASS "_NCTablePad_" -#endif - - NCTablePad::NCTablePad( int lines, int cols, const NCWidget & p ) : NCPad( lines, cols, p ) Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCWidget.cc?rev=48133&r1=48132&r2=48133&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCWidget.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCWidget.cc Fri Jun 6 18:37:22 2008 @@ -15,8 +15,8 @@ Author: Michael Andres /-*/ -#include <climits> +#include <climits> #define YUILogComponent "ncurses" #include @@ -24,25 +24,19 @@ #include "NCWidget.h" #include "YWidget.h" -//#if 0 -#undef DBG_CLASS -#define DBG_CLASS "_NCWidget_" -//#endif - - NCWidget::NCWidget( YWidget * parent ) - : tnode( this ) - , magic( YWIDGET_MAGIC ) - , grabedBy( 0 ) - , win( 0 ) - , defsze( 11, 45 ) - , framedim( 0, 0 ) - , inparent( -1, -1 ) - , noUpdates( false ) - , skipNoDimWin( true ) - , wstate( NC::WSnormal ) - , hotlabel( 0 ) + : tnode( this ) + , magic( YWIDGET_MAGIC ) + , grabedBy( 0 ) + , win( 0 ) + , defsze( 11, 45 ) + , framedim( 0, 0 ) + , inparent( -1, -1 ) + , noUpdates( false ) + , skipNoDimWin( true ) + , wstate( NC::WSnormal ) + , hotlabel( 0 ) { NCWidget * myparent = dynamic_cast( parent ); @@ -54,18 +48,19 @@ yuiDebug() << "CCC " << this << " parent " << myparent << endl; } + NCWidget::NCWidget( NCWidget * myparent ) - : tnode( this ) - , magic( YWIDGET_MAGIC ) - , grabedBy( 0 ) - , win( 0 ) - , defsze( 11, 45 ) - , framedim( 0, 0 ) - , inparent( -1, -1 ) - , noUpdates( false ) - , skipNoDimWin( true ) - , wstate( NC::WSnormal ) - , hotlabel( 0 ) + : tnode( this ) + , magic( YWIDGET_MAGIC ) + , grabedBy( 0 ) + , win( 0 ) + , defsze( 11, 45 ) + , framedim( 0, 0 ) + , inparent( -1, -1 ) + , noUpdates( false ) + , skipNoDimWin( true ) + , wstate( NC::WSnormal ) + , hotlabel( 0 ) { if ( myparent ) { @@ -202,11 +197,7 @@ } wCreate( newrect ); - -// if ( win ) SetState( wstate, true ); -// else -// SetState( NC::WSdumb, true ); } catch ( NCursesError & err ) { @@ -397,8 +388,8 @@ tnode *c = this; - //If widget has kids ([HV]Boxes, alignments,...), disable all of - //them recursively (#256707) + // If widget has children ([HV]Boxes, alignments,...), disable all of + // them recursively (#256707). if ( c->HasChildren() ) { 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=48133&r1=48132&r2=48133&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:37:22 2008 @@ -411,29 +411,15 @@ NCattribute::setChar( cch, '^' ); ACS_UARROW = cch; } - -#if 0 - ret = stdpan->addch( 1, 1, ACS_HLINE ); - - ret = stdpan->addch( 2, 1, ACS_VLINE ); - - Redraw(); - - ::getch(); - -#endif - } - const NCstyle & NCurses::style() { return *myself->styleset; } - void NCurses::Update() { if ( myself && myself->initialized() ) @@ -444,7 +430,6 @@ } - void NCurses::Refresh() { if ( myself && myself->initialized() ) @@ -459,7 +444,6 @@ } - void NCurses::Redraw() { if ( myself && myself->initialized() ) @@ -489,7 +473,6 @@ } - void NCurses::SetTitle( const string & str ) { if ( myself && myself->title_w ) Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesw.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesw.cc?rev=48133&r1=48132&r2=48133&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesw.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesw.cc Fri Jun 6 18:37:22 2008 @@ -54,67 +54,13 @@ #define COLORS_MONOCHROME 1 #define COLORS_ARE_REALLY_THERE 2 -// declare static variables for the class +// +// static class variables +// long NCursesWindow::count = 0L; bool NCursesWindow::b_initialized = FALSE; -//--------------------------------------------------------------------------- -#if 0 -int -NCursesWindow::scanw( const char* fmt, ... ) -{ -#if defined(__GNUG__) - va_list args; - va_start( args, fmt ); - char buf[BUFSIZ]; - int result = wgetstr( w, buf ); - - if ( result == OK ) - { - strstreambuf ss( buf, BUFSIZ ); - result = ss.vscan( fmt, args ); - } - - va_end( args ); - - return result; -#else - return ERR; -#endif -} - -int -NCursesWindow::scanw( int y, int x, const char* fmt, ... ) -{ -#if defined(__GNUG__) - va_list args; - va_start( args, fmt ); - char buf[BUFSIZ]; - int result = wmove( w, y, x ); - - if ( result == OK ) - { - result = wgetstr( w, buf ); - - if ( result == OK ) - { - strstreambuf ss( buf, BUFSIZ ); - result = ss.vscan( fmt, args ); - } - } - - va_end( args ); - - return result; -#else - return ERR; -#endif -} - -#endif -//------------------------------------------------------------------------ - int NCursesWindow::printw( const char * fmt, ... ) Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesw.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesw.h?rev=48133&r1=48132&r2=48133&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesw.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesw.h Fri Jun 6 18:37:22 2008 @@ -1226,29 +1226,6 @@ return ::mvwinnstr( w, y, x, s, n ); } -#if 0 - /** - * Perform a scanw function from the window. This only works if you're - * using the GNU C++ compiler. - */ - int scanw( const char* fmt, ... ) -#if __GNUG__ >= 2 - __attribute__(( format( scanf, 2, 3 ) ) ); -#else - ; -#endif - - /** - * Move the cursor to the requested position and then perform a scanw - * from the window. This nly works if you're using the GNU C++ compiler. - */ - int scanw( int y, int x, const char* fmt, ... ) -#if __GNUG__ >= 2 - __attribute__(( format( scanf, 4, 5 ) ) ); -#else - ; -#endif -#endif // ------------------------------------------------------------------------- // output -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org