[yast-commit] r48120 - /branches/tmp/sh/ncurses-cleanup/ncurses/src/

Author: sh-sh-sh Date: Fri Jun 6 17:25:36 2008 New Revision: 48120 URL: http://svn.opensuse.org/viewcvs/yast?rev=48120&view=rev Log: consistency Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAlignment.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCApplication.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAskForDirectory.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAskForFile.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBox.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBoxFrame.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCComboBox.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCEmpty.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFileSelection.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFrame.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCImage.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCInputField.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCIntField.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLabel.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLayoutBox.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLogView.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMenuButton.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMultiLineEdit.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMultiSelectionBox.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCOptionalWidgetFactory.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPackageSelectorPluginIf.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPackageSelectorPluginStub.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPad.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPadWidget.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopup.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupInfo.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupList.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupMenu.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupTable.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupTextEntry.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCProgressBar.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPushButton.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRadioButton.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRadioButtonGroup.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCReplacePoint.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRichText.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSelectionBox.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSpacing.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSquash.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCStyleDef.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTableItem.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTablePad.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTextPad.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTree.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTreePad.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCWidget.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCWidgetFactory.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCi18n.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstring.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.braille.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.linux.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.mono.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.rxvt.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.xterm.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtext.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtoY2Event.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtypes.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCurses.h branches/tmp/sh/ncurses-cleanup/ncurses/src/YNCursesUI.h branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesp.cc branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesp.h branches/tmp/sh/ncurses-cleanup/ncurses/src/position.h branches/tmp/sh/ncurses-cleanup/ncurses/src/stdutil.h branches/tmp/sh/ncurses-cleanup/ncurses/src/stringutil.h branches/tmp/sh/ncurses-cleanup/ncurses/src/tnode.h Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAlignment.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAlignment.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAlignment.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAlignment.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCAlignment_h #define NCAlignment_h @@ -28,13 +29,13 @@ class NCAlignment : public YAlignment, public NCWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCAlignment & OBJ ); NCAlignment & operator=( const NCAlignment & ); NCAlignment( const NCAlignment & ); -private: protected: @@ -49,11 +50,6 @@ virtual int preferredHeight() { return YAlignment::preferredHeight(); } - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual void moveChild( YWidget * child, int newx, int newy ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCApplication.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCApplication.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCApplication.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCApplication.h Fri Jun 6 17:25:36 2008 @@ -16,7 +16,6 @@ /-*/ - #ifndef NCApplication_h #define NCApplication_h Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAskForDirectory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAskForDirectory.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAskForDirectory.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAskForDirectory.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Gabriele Strattner /-*/ + #ifndef NCAskForExistingDirectory_h #define NCAskForExistingDirectory_h @@ -62,25 +63,17 @@ virtual ~NCAskForExistingDirectory(); - /** - * Set the default size - */ - virtual int preferredWidth(); virtual int preferredHeight(); /** * Create layout of file directory selection popup - * @param string The initial start directory - * @param string The headline of the popup - * @return void */ - void createLayout( const string & iniDir, + void createLayout( const string & initialDir, const string & headline ); /** * Shows the popup with the list of directories. - * @return NCursesEvent */ NCursesEvent & showDirPopup( ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAskForFile.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAskForFile.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAskForFile.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAskForFile.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Gabriele Strattner /-*/ + #ifndef NCAskForFile_h #define NCAskForFile_h @@ -35,11 +36,11 @@ class NCAskForFile : public NCPopup { +private: NCAskForFile & operator=( const NCAskForFile & ); NCAskForFile( const NCAskForFile & ); -private: NCPushButton * okButton; NCPushButton * cancelButton; @@ -81,11 +82,10 @@ /** * Create layout of file selection popup - * @param string The initial start directory - * @param string The filter (show files matching this pattern) - * @param string The headline of the popup - * @param bool File name field editable? - * @return void + * iniDir: The initial start directory + * filter: pattern what files to show + * headline: popup headline + * editable: file name field editable? */ void createLayout( const string & iniDir, const string & filter, @@ -94,13 +94,11 @@ /** * Shows the popup with the list of directories. - * @return NCursesEvent */ NCursesEvent & showDirPopup( ); /** * Show new file information - * @return void */ void updateFileList(); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.h Fri Jun 6 17:25:36 2008 @@ -16,6 +16,7 @@ Maintainer: Thomas Goettlicher /-*/ + #ifndef NCBusyIndicator_h #define NCBusyIndicator_h @@ -33,13 +34,13 @@ class NCBusyIndicator : public YBusyIndicator, public NCWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCBusyIndicator & OBJ ); NCBusyIndicator & operator=( const NCBusyIndicator & ); NCBusyIndicator( const NCBusyIndicator & ); -private: typedef long long Value_t; NClabel _label; @@ -80,11 +81,6 @@ virtual int preferredWidth(); virtual int preferredHeight(); - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual void setLabel( const string & nlabel ); @@ -98,6 +94,7 @@ int timeout() const { return _timeout; } void handler( int sig_num ); + static void staticHandler( int sig_num ); }; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBox.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBox.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBox.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCCheckBox_h #define NCCheckBox_h @@ -67,11 +68,6 @@ virtual int preferredWidth(); virtual int preferredHeight(); - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual void setLabel( const string & nlabel ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBoxFrame.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBoxFrame.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBoxFrame.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBoxFrame.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCCheckBoxFrame_h #define NCCheckBoxFrame_h @@ -29,13 +30,13 @@ class NCCheckBoxFrame : public YCheckBoxFrame, public NCWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCCheckBoxFrame & OBJ ); NCCheckBoxFrame & operator=( const NCCheckBoxFrame & ); NCCheckBoxFrame( const NCCheckBoxFrame & ); -private: NClabel label; bool isEnabled; @@ -58,22 +59,17 @@ virtual int preferredWidth(); virtual int preferredHeight(); - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ + virtual void setSize( int newWidth, int newHeight ); virtual void setLabel( const string & nlabel ); - //virtual void setEnabling( bool do_bv ); virtual void setEnabled( bool do_bv ); virtual bool getValue() { return isEnabled; } - //Do not forget to call Redraw(), so that UI::ChangeWidget works - //correctly - #301370 + // Do not forget to call Redraw(), so that UI::ChangeWidget works + // correctly - bug #301370 virtual void setValue( bool enable ) { isEnabled = enable; Redraw();} virtual bool setKeyboardFocus(); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCComboBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCComboBox.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCComboBox.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCComboBox.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCComboBox_h #define NCComboBox_h @@ -34,13 +35,13 @@ class NCComboBox : public YComboBox, public NCWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCComboBox & OBJ ); NCComboBox & operator=( const NCComboBox & ); NCComboBox( const NCComboBox & ); -private: bool mayedit; NClabel label; @@ -95,11 +96,6 @@ virtual int preferredWidth(); virtual int preferredHeight(); - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual void setLabel( const string & nlabel ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCDialog_h #define NCDialog_h @@ -210,8 +211,7 @@ return dlgstyle ? *dlgstyle : NCurses::style()[NCstyle::DefaultStyle]; } - //virtual void setEnabling( bool do_bv ) { /*NOP*/ } - virtual void setEnabled( bool do_bv ) { /*NOP*/ }; + virtual void setEnabled( bool do_bv ) {} private: Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCEmpty.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCEmpty.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCEmpty.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCEmpty.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCEmpty_h #define NCEmpty_h @@ -28,13 +29,13 @@ class NCEmpty : public YEmpty, public NCWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCEmpty & OBJ ); NCEmpty & operator=( const NCEmpty & ); NCEmpty( const NCEmpty & ); -private: protected: @@ -43,20 +44,15 @@ public: NCEmpty( YWidget * parent ); + virtual ~NCEmpty(); - // virtual long nicesize( YUIDimension dim ){ return YEmpty::nicesize( dim ); } virtual int preferredWidth() { return YEmpty::preferredWidth(); } virtual int preferredHeight() { return YEmpty::preferredHeight(); } - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); - //virtual void setEnabling( bool do_bv ) { NCWidget::setEnabling( enabled=do_bv ); } + virtual void setEnabled( bool do_bv ); }; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFileSelection.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFileSelection.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFileSelection.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFileSelection.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Gabriele Strattner /-*/ + #ifndef NCFileSelection_h #define NCFileSelection_h @@ -72,9 +73,7 @@ /** * This class is used for the first column of the file table. * Contains the file data. - * **/ - class NCFileSelectionTag : public NCTableCol { @@ -96,14 +95,12 @@ NCFileInfo getFileInfo() const { return fileInfo; } }; + /** * The class which provides methods to handle a list of files or directories. - * **/ - class NCFileSelection : public NCTable { - public: enum NCFileSelectionType { @@ -146,24 +143,17 @@ /** * Get the file info. - * @param index The list index - * @return fileInfo Information about the file (directory) + * index: The list index + * return: fileInfo Information about the file (directory) */ NCFileInfo getFileInfo( int index ); /** * Set the type of the table widget - * @param type Possible values: NCFileSelection::T_Overview, NCFileSelection::T_Detailed + * type: Possible values: NCFileSelection::T_Overview, NCFileSelection::T_Detailed */ void setTableType( NCFileSelectionType type ) { tableType = type; }; - /** - * This method is called to add a line to the file list. - * @param status The file type (first column of the table) - * @param elements A vector<string> containing the package data - * @param objPtr The pointer to the packagemanager object - * @return void - */ virtual void addLine( const vector<string> & elements, const NCFileInfo & fileInfo ); @@ -173,9 +163,9 @@ unsigned int getNumLines( ) { return myPad()->Lines(); } /** - * Draws the file list (has to be called after the loop with - * addLine() calls) - */ + * Draws the file list (has to be called after the loop with + * addLine() calls) + */ void drawList( ) { return DrawPad(); } /** @@ -185,26 +175,23 @@ /** * Fills the header of the table - * @return void */ - virtual void fillHeader( ) = 0; + virtual void fillHeader() = 0; /** * Creates a line in the package table. - * @param pkgPtr The package pointer - * @return bool */ virtual bool createListEntry( const NCFileInfo & fileInfo ) = 0; /** * Get the current directory - * @return string The currently selected directory + * return: The currently selected directory */ string getCurrentDir() { return currentDir; } /** * Fill the list of diretcories or files - * @return bool List successfully filled + * Returns 'true' on success. */ virtual bool fillList( ) = 0; @@ -219,9 +206,9 @@ }; + class NCFileTable : public NCFileSelection { - private: list<string> pattern; // files must match this pattern @@ -230,8 +217,8 @@ public: /** - * Constructor - */ + * Constructor + */ NCFileTable( YWidget * parent, YTableHeader * tableHeader, NCFileSelectionType type, @@ -255,7 +242,7 @@ /** * Fill the list of files - * @return bool List successfully filled + * Returns 'true' on success. */ virtual bool fillList( ); @@ -265,11 +252,7 @@ class NCDirectoryTable : public NCFileSelection { - public: - /** - * Constructor - */ NCDirectoryTable( YWidget * parent, YTableHeader * tableHeader, NCFileSelectionType type, @@ -282,13 +265,12 @@ virtual bool createListEntry( const NCFileInfo & fileInfo ); /** - * Fill the list of directories - * @return bool List successfully filled - */ + * Fill the list of directories. + * Returns 'true' on success. + */ virtual bool fillList( ); virtual NCursesEvent wHandleInput( wint_t key ); - }; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFrame.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFrame.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFrame.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFrame.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCFrame_h #define NCFrame_h @@ -28,13 +29,13 @@ class NCFrame : public YFrame, public NCWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCFrame & OBJ ); NCFrame & operator=( const NCFrame & ); NCFrame( const NCFrame & ); -private: NClabel label; @@ -56,16 +57,10 @@ virtual int preferredWidth(); virtual int preferredHeight(); - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual void setLabel( const string & nlabel ); - //virtual void setEnabling( bool do_bv ) { NCWidget::setEnabling( enabled=do_bv ); } virtual void setEnabled( bool do_bv ); }; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCImage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCImage.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCImage.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCImage.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCImage_h #define NCImage_h @@ -52,13 +53,8 @@ virtual int preferredWidth(); virtual int preferredHeight(); - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); - //virtual void setEnabling( bool do_bv ) { NCWidget::setEnabling( enabled=do_bv ); } + virtual void setEnabled( bool do_bv ); }; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCInputField.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCInputField.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCInputField.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCInputField.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCInputField_h #define NCInputField_h @@ -100,11 +101,6 @@ virtual int preferredWidth(); virtual int preferredHeight(); - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual void setLabel( const string & nlabel ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCIntField.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCIntField.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCIntField.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCIntField.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCIntField_h #define NCIntField_h @@ -28,13 +29,13 @@ class NCIntField : public YIntField, public NCWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCIntField & OBJ ); NCIntField & operator=( const NCIntField & ); NCIntField( const NCIntField & ); -private: static const unsigned taglen; @@ -74,11 +75,6 @@ virtual int preferredWidth(); virtual int preferredHeight(); - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual void setLabel( const string & nlabel ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLabel.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLabel.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLabel.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLabel.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCLabel_h #define NCLabel_h @@ -28,13 +29,13 @@ class NCLabel : public YLabel, public NCWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCLabel & OBJ ); NCLabel & operator=( const NCLabel & ); NCLabel( const NCLabel & ); -private: bool heading; NClabel label; @@ -55,20 +56,15 @@ virtual ~NCLabel(); virtual long nicesize( YUIDimension dim ); - - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ + + virtual int preferredWidth(); + virtual int preferredHeight(); + virtual void setSize( int newWidth, int newHeight ); virtual void setText( const string & nlabel ); virtual void setEnabled( bool do_bv ); - - virtual int preferredWidth(); - virtual int preferredHeight(); }; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLayoutBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLayoutBox.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLayoutBox.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLayoutBox.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCLayoutBox_h #define NCLayoutBox_h @@ -28,13 +29,13 @@ class NCLayoutBox : public YLayoutBox, public NCWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCLayoutBox & OBJ ); NCLayoutBox & operator=( const NCLayoutBox & ); NCLayoutBox( const NCLayoutBox & ); -private: protected: @@ -54,16 +55,10 @@ virtual int preferredHeight() { return YLayoutBox::preferredHeight(); } - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual void moveChild( YWidget * child, int newx, int newy ); - //virtual void setEnabling( bool do_bv ) { NCWidget::setEnabling( enabled=do_bv ); } virtual void setEnabled( bool do_bv ); }; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLogView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLogView.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLogView.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLogView.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCLogView_h #define NCLogView_h @@ -28,13 +29,13 @@ class NCLogView : public YLogView, public NCPadWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCLogView & OBJ ); NCLogView & operator=( const NCLogView & ); NCLogView( const NCLogView & ); -private: NCtext text; @@ -59,11 +60,6 @@ virtual int preferredWidth(); virtual int preferredHeight(); - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual void setLabel( const string & nlabel ); @@ -71,7 +67,6 @@ virtual NCursesEvent wHandleInput( wint_t key ); - //virtual void setEnabling( bool do_bv ) { NCWidget::setEnabling( enabled=do_bv ); } virtual void setEnabled( bool do_bv ); virtual bool setKeyboardFocus() Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMenuButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMenuButton.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMenuButton.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMenuButton.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCMenuButton_h #define NCMenuButton_h @@ -57,14 +58,9 @@ virtual int preferredWidth(); virtual int preferredHeight(); - virtual void rebuildMenuTree(); - - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); + + virtual void rebuildMenuTree(); virtual NCursesEvent wHandleInput( wint_t key ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMultiLineEdit.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMultiLineEdit.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMultiLineEdit.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMultiLineEdit.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCMultiLineEdit_h #define NCMultiLineEdit_h @@ -64,11 +65,6 @@ virtual int preferredWidth(); virtual int preferredHeight(); - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual void setLabel( const string & nlabel ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMultiSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMultiSelectionBox.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMultiSelectionBox.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMultiSelectionBox.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCMultiSelectionBox_h #define NCMultiSelectionBox_h @@ -25,14 +26,11 @@ #include "NCTablePad.h" class NCMultiSelectionBox; - class NCTableTag; - class NCTableTag : public NCTableCol { - private: YItem *yitem; @@ -129,11 +127,6 @@ virtual int preferredWidth(); virtual int preferredHeight(); - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual void setLabel( const string & nlabel ); @@ -153,7 +146,6 @@ return true; } - // added by gs unsigned int getNumLines( ) { return myPad()->Lines(); } const NCTableLine * getLine( const int & index ) { return myPad()->GetLine( index ); } Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCOptionalWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCOptionalWidgetFactory.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCOptionalWidgetFactory.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCOptionalWidgetFactory.h Fri Jun 6 17:25:36 2008 @@ -40,7 +40,7 @@ // Optional Widgets // - // PkgSpecial() + // Currently none for this UI protected: Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPackageSelectorPluginIf.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPackageSelectorPluginIf.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPackageSelectorPluginIf.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPackageSelectorPluginIf.h Fri Jun 6 17:25:36 2008 @@ -12,7 +12,7 @@ File: NCPackageSelectorPluginIf.h - Author: Hedgehog Painter + Author: Katharina Machalkova /-*/ @@ -39,4 +39,5 @@ }; + #endif Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPackageSelectorPluginStub.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPackageSelectorPluginStub.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPackageSelectorPluginStub.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPackageSelectorPluginStub.h Fri Jun 6 17:25:36 2008 @@ -12,7 +12,7 @@ File: NCPackageSelectorPluginStub.h - Author: Hedgehog Painter + Author: Katharina Machalkova /-*/ @@ -34,10 +34,8 @@ class NCPackageSelectorPluginStub: public YPackageSelectorPlugin { - public: - /** * Constructor: Load the plugin library for the NCurses package selector. **/ Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPad.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPad.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPad.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPad.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCPad_h #define NCPad_h @@ -31,14 +32,12 @@ virtual ~NCSchrollCB() {} - // callback virtual void HScroll( unsigned total, unsigned visible, unsigned start ) {} virtual void VScroll( unsigned total, unsigned visible, unsigned start ) {} virtual void ScrollHead( NCursesWindow & w, unsigned ccol ) {} - // virtual void AdjustPadSize( wsze & minsze ) {} }; @@ -89,7 +88,6 @@ class NCPad : public NCursesPad, public NCScrollHint { - protected: const NCWidget & parw; @@ -103,8 +101,7 @@ bool dclear; bool dirty; -protected: - + virtual int dirtyPad() { dirty = false; return setpos( CurPos() ); } virtual int setpos( const wpos & newpos ); @@ -119,14 +116,14 @@ public: NCPad( int lines, int cols, const NCWidget & p ) - : NCursesPad( lines, cols ) - , parw( p ) - , destwin( 0 ) - , maxdpos( 0 ) - , maxspos( 0 ) - , dclear( false ) - , dirty( false ) - {} + : NCursesPad( lines, cols ) + , parw( p ) + , destwin( 0 ) + , maxdpos( 0 ) + , maxspos( 0 ) + , dclear( false ) + , dirty( false ) + {} virtual ~NCPad() {} Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPadWidget.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPadWidget.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPadWidget.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPadWidget.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCPadWidget_h #define NCPadWidget_h @@ -24,19 +25,18 @@ #include "NCPad.h" class NCPadWidget; - class NCScrollbar; class NCPadWidget : public NCWidget, protected NCSchrollCB { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCPadWidget & OBJ ); NCPadWidget & operator=( const NCPadWidget & ); NCPadWidget( const NCPadWidget & ); -private: NClabel label; NCursesWindow * padwin; @@ -115,7 +115,6 @@ void setLabel( const NClabel & nlabel ); virtual void setEnabled( bool do_bv ) { NCWidget::setEnabled( do_bv ); } - }; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopup.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopup.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopup.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopup.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCPopup_h #define NCPopup_h @@ -38,8 +39,6 @@ virtual NCursesEvent wHandleInput( wint_t ch ); -protected: - NCPopup( const wpos at, const bool boxed = true ); virtual ~NCPopup(); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupInfo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupInfo.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupInfo.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupInfo.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Gabriele Strattner /-*/ + #ifndef NCPopupInfo_h #define NCPopupInfo_h @@ -34,7 +35,7 @@ /* Textdomain "ncurses" -*/ + */ @@ -81,11 +82,11 @@ NCursesEvent & showInfoPopup( ); - void popup( ); + void popup(); - void popdown( ); + void popdown(); - bool isVisible( ) { return visible; } + bool isVisible() { return visible; } void setNiceSize( int horiz, int vert ) { hDim = horiz; vDim = vert; } }; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupList.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupList.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupList.h Fri Jun 6 17:25:36 2008 @@ -19,7 +19,6 @@ #define NCPopupList_h #include <iosfwd> - #include <list> using namespace std; @@ -27,7 +26,6 @@ #include "NCPopupTable.h" - class NCPopupList : public NCPopupTable { @@ -44,6 +42,7 @@ const string & label, const list<string> & deflist, int index = 0 ); + virtual ~NCPopupList(); void createEntries( const list<string> & deflist, int index ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupMenu.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupMenu.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupMenu.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupMenu.h Fri Jun 6 17:25:36 2008 @@ -19,7 +19,6 @@ #define NCPopupMenu_h #include <iosfwd> - #include <list> using namespace std; @@ -30,12 +29,11 @@ class NCPopupMenu : public NCPopupTable { +private: NCPopupMenu & operator=( const NCPopupMenu & ); NCPopupMenu( const NCPopupMenu & ); -private: - std::map itemsMap; protected: Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupTable.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupTable.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupTable.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCPopupTable_h #define NCPopupTable_h @@ -31,7 +32,6 @@ class NCTable; - class NCPopupTable : public NCPopup { Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupTextEntry.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupTextEntry.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupTextEntry.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupTextEntry.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCPopupTextEntry_h #define NCPopupTextEntry_h @@ -27,11 +28,11 @@ class NCPopupTextEntry : public NCPopup { +private: NCPopupTextEntry & operator=( const NCPopupTextEntry & ); NCPopupTextEntry( const NCPopupTextEntry & ); -private: NCInputField * wtext; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCProgressBar.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCProgressBar.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCProgressBar.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCProgressBar.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCProgressBar_h #define NCProgressBar_h @@ -28,13 +29,14 @@ class NCProgressBar : public YProgressBar, public NCWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCProgressBar & OBJ ); NCProgressBar & operator=( const NCProgressBar & ); NCProgressBar( const NCProgressBar & ); -private: + typedef long long Value_t; NClabel label; @@ -48,7 +50,6 @@ protected: - virtual const char * location() const { return "NCProgressBar"; } virtual void wCreate( const wrect & newrect ); @@ -68,11 +69,6 @@ virtual int preferredWidth(); virtual int preferredHeight(); - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual void setLabel( const string & nlabel ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPushButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPushButton.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPushButton.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPushButton.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCPushButton_h #define NCPushButton_h @@ -28,13 +29,13 @@ class NCPushButton : public YPushButton, public NCWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCPushButton & OBJ ); NCPushButton & operator=( const NCPushButton & ); NCPushButton( const NCPushButton & ); -private: NClabel label; @@ -52,11 +53,6 @@ virtual int preferredWidth(); virtual int preferredHeight(); - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual NCursesEvent wHandleInput( wint_t key ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRadioButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRadioButton.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRadioButton.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRadioButton.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCRadioButton_h #define NCRadioButton_h @@ -43,8 +44,6 @@ virtual const char * location() const { return "NCRadioButton"; } - // virtual void setValue( const bool & checked ); - virtual void wRedraw(); public: @@ -58,11 +57,6 @@ virtual int preferredWidth(); virtual int preferredHeight(); - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual void setLabel( const string & nlabel ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRadioButtonGroup.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRadioButtonGroup.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRadioButtonGroup.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRadioButtonGroup.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCRadioButtonGroup_h #define NCRadioButtonGroup_h @@ -51,11 +52,6 @@ virtual int preferredHeight() { return YRadioButtonGroup::preferredHeight(); } - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual void addRadioButton( YRadioButton *button ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCReplacePoint.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCReplacePoint.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCReplacePoint.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCReplacePoint.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCReplacePoint_h #define NCReplacePoint_h @@ -34,8 +35,6 @@ NCReplacePoint & operator=( const NCReplacePoint & ); NCReplacePoint( const NCReplacePoint & ); -private: - protected: virtual const char * location() const { return "NCReplacePoint"; } @@ -50,14 +49,8 @@ virtual int preferredHeight() { return YReplacePoint::preferredHeight(); } - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); - //virtual void setEnabling( bool do_bv ) { NCWidget::setEnabling( enabled=do_bv ); } virtual void setEnabled( bool do_bv ); }; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRichText.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRichText.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRichText.h Fri Jun 6 17:25:36 2008 @@ -217,11 +217,6 @@ virtual int preferredWidth(); virtual int preferredHeight(); - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual void setLabel( const string & nlabel ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSelectionBox.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSelectionBox.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSelectionBox.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCSelectionBox_h #define NCSelectionBox_h @@ -67,11 +68,6 @@ virtual int preferredWidth(); virtual int preferredHeight(); - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual void setLabel( const string & nlabel ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSpacing.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSpacing.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSpacing.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSpacing.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCSpacing_h #define NCSpacing_h @@ -25,6 +26,7 @@ #include "YSpacing.h" #include "NCWidget.h" + class NCSpacing; @@ -51,18 +53,12 @@ virtual ~NCSpacing(); - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); virtual int preferredWidth() { return YSpacing::preferredWidth(); } virtual int preferredHeight() { return YSpacing::preferredHeight(); } - //virtual void setEnabling( bool do_bv ) { NCWidget::setEnabling( enabled=do_bv ); } virtual void setEnabled( bool do_bv ); }; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSquash.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSquash.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSquash.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSquash.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCSquash_h #define NCSquash_h @@ -31,11 +32,11 @@ friend std::ostream & operator<<( std::ostream & STREAM, const NCSquash & OBJ ); +private: + NCSquash & operator=( const NCSquash & ); NCSquash( const NCSquash & ); -private: - protected: virtual const char * location() const { return "NCSquash"; } @@ -45,19 +46,12 @@ NCSquash( YWidget * parent, bool hsquash, bool vsquash ); virtual ~NCSquash(); - //virtual long nicesize( YUIDimension dim ) { return YSquash::nicesize( dim ); } virtual int preferredWidth() { return YSquash::preferredWidth(); } virtual int preferredHeight() { return YSquash::preferredHeight(); } - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ virtual void setSize( int newWidth, int newHeight ); - //virtual void setEnabling( bool do_bv ) { NCWidget::setEnabling( enabled=do_bv ); } virtual void setEnabled( bool do_bv ); }; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCStyleDef.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCStyleDef.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCStyleDef.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCStyleDef.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCStyleDef_h #define NCStyleDef_h Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTableItem.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTableItem.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTableItem.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTableItem.h Fri Jun 6 17:25:36 2008 @@ -15,11 +15,11 @@ Author: Michael Andres /-*/ + #ifndef NCTableItem_h #define NCTableItem_h #include <iosfwd> - #include <vector> using namespace std; @@ -29,7 +29,6 @@ #include "YTableItem.h" class NCTableStyle; - class NCTableCol; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTablePad.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTablePad.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTablePad.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTablePad.h Fri Jun 6 17:25:36 2008 @@ -15,11 +15,11 @@ Author: Michael Andres /-*/ + #ifndef NCTablePad_h #define NCTablePad_h #include <iosfwd> - #include <vector> using namespace std; @@ -29,7 +29,6 @@ #include "NCstring.h" class NCTableLine; - class NCTableCol; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTextPad.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTextPad.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTextPad.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTextPad.h Fri Jun 6 17:25:36 2008 @@ -19,7 +19,6 @@ #define NCTextPad_h #include <iosfwd> - #include <list> using namespace std; @@ -28,7 +27,6 @@ #include "NCtext.h" - class NCTextPad : public NCPad { Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTree.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTree.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTree.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTree.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCTree_h #define NCTree_h @@ -29,7 +30,6 @@ class NCTree : public YTree, public NCPadWidget { - friend std::ostream & operator<<( std::ostream & STREAM, const NCTree & OBJ ); NCTree & operator=( const NCTree & ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTreePad.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTreePad.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTreePad.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTreePad.h Fri Jun 6 17:25:36 2008 @@ -15,11 +15,11 @@ Author: Michael Andres /-*/ + #ifndef NCTreePad_h #define NCTreePad_h #include <iosfwd> - #include <vector> using namespace std; @@ -29,7 +29,6 @@ #include "NCstring.h" class NCTableLine; - class NCTableCol; @@ -86,6 +85,7 @@ public: bool SetHeadline( const vector<NCstring> & head ); + virtual void SendHead() { SetHead( Headpad, srect.Pos.C ); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCWidget.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCWidget.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCWidget.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCWidget.h Fri Jun 6 17:25:36 2008 @@ -15,23 +15,24 @@ Author: Michael Andres /-*/ + #ifndef NCWidget_h #define NCWidget_h + #include <iosfwd> #include "NCurses.h" #include "tnode.h" class NCWidget; - class NCursesWindow; - class NClabel; -#define DLOC location() << ' ' -#define YWIDGET_MAGIC 42 +#define DLOC location() << ' ' + +#define YWIDGET_MAGIC 42 class NCWidget : public tnode, protected NCursesError @@ -77,6 +78,7 @@ virtual bool wantFocus( NCWidget & ngrab ) { return false; } public: + void grabSet( NCWidget * ngrab ) { if ( grabedBy && grabedBy != ngrab ) @@ -145,11 +147,14 @@ return NCurses::style()[NCstyle::DefaultStyle]; } - const NCstyle::StWidget & widgetStyle( bool nonactive = false ) const { return wStyle().getWidget( GetState(), nonactive ); } + const NCstyle::StWidget & widgetStyle( bool nonactive = false ) const + { return wStyle().getWidget( GetState(), nonactive ); } - const NCstyle::StWidget & frameStyle() const { return wStyle().getFrame( GetState() ); } + const NCstyle::StWidget & frameStyle() const + { return wStyle().getFrame( GetState() ); } - const NCstyle::StList & listStyle() const { return wStyle().getList( GetState() ); } + const NCstyle::StList & listStyle() const + { return wStyle().getList( GetState() ); } wsze wGetDefsze() const { return defsze; } @@ -161,15 +166,12 @@ NC::WState GetState() const { return wstate; } - void SetState( const NC::WState newstate, const bool force = false ); + void SetState( const NC::WState newstate, const bool force = false ); /** - * Pure virtual to make shure every widget implements it. Necessary to make - * shure that UI requests via YWidget::setEnabled perform, and behave the + * Pure virtual to make sure every widget implements it. Necessary to make + * sure that UI requests via YWidget::setEnabled perform, and behave the * same way as direct calls to NCWidget::setEnabled. - * - * Defaut implementation is provided, and for most derived widgets it's ok - * to simply use it. **/ virtual void setEnabled( bool do_bv ) = 0; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCWidgetFactory.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCWidgetFactory.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCWidgetFactory.h Fri Jun 6 17:25:36 2008 @@ -139,10 +139,10 @@ /** * Creates a MultiLineEdit widget * @param label label above the edit field - */ + */ virtual NCMultiLineEdit * createMultiLineEdit ( YWidget * parent, const string & label ); - /** + /** * Creates an image widget */ virtual NCImage * createImage ( YWidget * parent, @@ -154,7 +154,7 @@ * @param label label above the log view * @param visibleLines default number of vislible lines * @param storedLines number of lines to store (use 0 for "all") - */ + */ virtual NCLogView * createLogView ( YWidget * parent, const string & label, int visibleLines, Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCi18n.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCi18n.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCi18n.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCi18n.h Fri Jun 6 17:25:36 2008 @@ -16,7 +16,6 @@ /-*/ - #ifndef NCi18n_h #define NCi18n_h @@ -25,8 +24,8 @@ /** * define _(...) for gettext - * @param msgid text which has to be translated - * @return NCstring + * msgid: text which has to be translated + * return: NCstring */ inline string _( const char * msgid ) @@ -36,10 +35,10 @@ /** * define _(...) for ngettext - * @param msgid1 message singular - * @param msgid2 message plural form - * @param n choose singular/plural form based on this value - * @return NCstring + * msgid1: message singular + * msgid2: message plural form + * n: choose singular/plural form based on this value + * return: NCstring */ inline string _( const char * msgid1, const char * msgid2, unsigned long int n ) { @@ -52,11 +51,12 @@ bind_textdomain_codeset( domain, "utf8" ); textdomain( domain ); - // Make change known. + // Make change known { extern int _nl_msg_cat_cntr; ++_nl_msg_cat_cntr; } } + #endif // NCi18n_h Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstring.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstring.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstring.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstring.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCstring_h #define NCstring_h @@ -28,7 +29,6 @@ using namespace std; - class NCstring { Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.braille.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.braille.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.braille.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.braille.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Generated by class NCstyle /-*/ + #ifndef NCstyle_braille_h #define NCstyle_braille_h Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCstyle_h #define NCstyle_h @@ -54,18 +55,18 @@ inline static chtype color_pair( int i ) { return colors() ? COLOR_PAIR( i ) : A_NORMAL; } - inline static short fg_color_pair( int i ) { return colors() ? ( COLOR_WHITE - ( i % colors() ) ) : -1; } + inline static short fg_color_pair( int i ) { return colors() ? ( COLOR_WHITE - ( i % colors() ) ) : -1; } - inline static short bg_color_pair( int i ) { return colors() ? ( i / colors() ) : -1; } + inline static short bg_color_pair( int i ) { return colors() ? ( i / colors() ) : -1; } // // chtype to color pair // - inline static int color_pair_of( chtype ch ) { return PAIR_NUMBER( ch ); } + inline static int color_pair_of( chtype ch ) { return PAIR_NUMBER( ch ); } - inline static short fg_color_of( chtype ch ) { return fg_color_pair( color_pair_of( ch ) ); } + inline static short fg_color_of( chtype ch ) { return fg_color_pair( color_pair_of( ch ) ); } - inline static short bg_color_of( chtype ch ) { return bg_color_pair( color_pair_of( ch ) ); } + inline static short bg_color_of( chtype ch ) { return bg_color_pair( color_pair_of( ch ) ); } // // chtype manipualtion @@ -74,13 +75,13 @@ static const chtype color_mask = A_COLOR; static const chtype char_mask = A_CHARTEXT | A_ALTCHARSET; // - inline static chtype getStyle( chtype a ) { return a & style_mask; } + inline static chtype getStyle( chtype a ) { return a & style_mask; } - inline static chtype getColor( chtype a ) { return a & color_mask; } + inline static chtype getColor( chtype a ) { return a & color_mask; } inline static chtype getChar( chtype a ) { return a & char_mask; } - inline static chtype getNonChar( chtype a ) { return a & ~char_mask; } + inline static chtype getNonChar( chtype a ) { return a & ~char_mask; } inline static void setStyle( chtype & a, chtype ch ) { a = ( a & ~style_mask ) | ( ch & style_mask ); } @@ -488,11 +489,7 @@ public: - /////////////////////////////////////////////////////////////////// - // - // CLASS NAME : NCstyle::Style - // - + class Style : private NCattrset, public StDialog { @@ -532,8 +529,6 @@ const chtype & operator()( STlocal a ) const { return attr( a ); } }; - /////////////////////////////////////////////////////////////////// - public: enum StyleSet @@ -561,8 +556,6 @@ NCstyle( string term_t ); ~NCstyle(); -public: - const chtype & operator()( STglobal a ) const { return Style::attrGlobal[a]; } const Style & operator[]( StyleSet a ) const @@ -573,8 +566,6 @@ return styleSet[a]; } -public: - void changeSyle(); void nextStyle(); Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.linux.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.linux.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.linux.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.linux.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Generated by class NCstyle /-*/ + #ifndef NCstyle_linux_h #define NCstyle_linux_h Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.mono.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.mono.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.mono.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.mono.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Generated by class NCstyle /-*/ + #ifndef NCstyle_mono_h #define NCstyle_mono_h Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.rxvt.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.rxvt.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.rxvt.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.rxvt.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Generated by class NCstyle /-*/ + #ifndef NCstyle_rxvt_h #define NCstyle_rxvt_h Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.xterm.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.xterm.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.xterm.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstyle.xterm.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Generated by class NCstyle /-*/ + #ifndef NCstyle_xterm_h #define NCstyle_xterm_h Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtext.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtext.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtext.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtext.h Fri Jun 6 17:25:36 2008 @@ -19,7 +19,6 @@ #define NCtext_h #include <iosfwd> - #include <list> using namespace std; @@ -86,15 +85,15 @@ virtual void lset( const NCstring & ntext ) { NCtext::lset( ntext ); -// stripHotkey(); } public: void stripHotkey(); + NClabel( const NCstring & nstr = "" ) : NCtext( nstr ) - { /*stripHotkey();*/ } + {} virtual ~NClabel() {} Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtoY2Event.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtoY2Event.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtoY2Event.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtoY2Event.h Fri Jun 6 17:25:36 2008 @@ -31,6 +31,7 @@ { public: + friend ostream & operator<<( std::ostream & stream, const NCtoY2Event & event ); /** Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtypes.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtypes.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtypes.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtypes.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCtypes_h #define NCtypes_h @@ -22,7 +23,6 @@ namespace NC { - enum ADJUST { CENTER = 0x00, @@ -49,4 +49,5 @@ extern std::ostream & operator<<( std::ostream & str, NC::ADJUST obj ); extern std::ostream & operator<<( std::ostream & str, NC::WState obj ); + #endif // NCtypes_h Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCurses.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCurses.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCurses.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCurses.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef NCurses_h #define NCurses_h @@ -42,7 +43,6 @@ class NCursesError { - public: int errval_i; @@ -99,17 +99,17 @@ YEvent::EventReason reason; NCursesEvent( Type t = none, YEvent::EventReason r = YEvent::UnknownReason ) - : type( t ) - , widget( 0 ) - , selection( 0 ) - , result( "" ) - , detail( NODETAIL ) - , reason( r ) + : type( t ) + , widget( 0 ) + , selection( 0 ) + , result( "" ) + , detail( NODETAIL ) + , reason( r ) {} virtual ~NCursesEvent() {} - // not operator bool() which would be propagated to almost everything ;) + // not operator bool() which would be propagated to almost everything operator void*() const { return type != none ? ( void* )1 : ( void* )0; } bool operator==( const NCursesEvent & e ) const { return type == e.type; } Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/YNCursesUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/YNCursesUI.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/YNCursesUI.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/YNCursesUI.h Fri Jun 6 17:25:36 2008 @@ -16,27 +16,21 @@ /-*/ + #ifndef YNCursesUI_h #define YNCursesUI_h #include <iosfwd> #include "YUI.h" - #include "NCApplication.h" - #include "NCurses.h" class YUI; - class NCDialog; - class NCPackageSelectorPluginStub; - class NCWidgetFactory; - class NCOptionalWidgetFactory; - class YSingleChildContainerWidget; @@ -47,7 +41,6 @@ class YNCursesUI : public NCurses, public YUI { - public: /** * Constructor Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesp.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesp.cc?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesp.cc (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesp.cc Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * * * @@ -54,8 +55,6 @@ #include "ncursesp.h" -// in cursesp.h -#warning FIX for broken bottom_panel (libpanel) NCursesPanel* NCursesPanel::dummy = ( NCursesPanel* )0; Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesp.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesp.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesp.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/ncursesp.h Fri Jun 6 17:25:36 2008 @@ -16,24 +16,19 @@ /-*/ -#ifndef _CURSESP_H -#define _CURSESP_H +#ifndef _NCURSESP_H +#define _NCURSESP_H #include <iosfwd> -// $Id$ - #include "ncursesw.h" #include "etip.h" extern "C" { -# include +#include } -/** - * @short -*/ class NCursesPanel : public NCursesWindow { @@ -58,7 +53,7 @@ /** * the pointer for the user's data */ - void* m_user; + void * m_user; /** * backward pointer to C++ object */ @@ -77,7 +72,7 @@ protected: /** * Set the user pointer of the panel. - */ + */ void set_user( void *user ) { UserHook* uptr = ( UserHook* )::panel_userptr( p ); @@ -108,7 +103,7 @@ /** * If err is equal to the curses error indicator ERR, an error handler * is called. - */ + */ void OnError( int err ) const THROWS( NCursesPanelException ) { if ( err == ERR ) @@ -118,12 +113,12 @@ public: /** * Create a panel with this size starting at the requested position. - */ + */ NCursesPanel( int lines, int cols, int begin_y = 0, int begin_x = 0 ) - : NCursesWindow( lines, cols, begin_y, begin_x ) + : NCursesWindow( lines, cols, begin_y, begin_x ) { init(); } @@ -131,7 +126,7 @@ /** * This constructor creates the default Panel associated with the * ::stdscr window - */ + */ NCursesPanel() : NCursesWindow( ::stdscr ) { init(); } virtual ~NCursesPanel(); @@ -140,7 +135,7 @@ /** * Resize the panel window. - */ + */ virtual int resize( int lines, int columns ) { ::wresize( w, lines, columns ); @@ -149,7 +144,7 @@ /** * Hide the panel. It stays in the stack but becomes invisible. - */ + */ inline void hide() { // [ma] hiding a hiden one should not abort. @@ -161,7 +156,7 @@ /** * Show the panel, i.e. make it visible. - */ + */ inline void show() { OnError( ::show_panel( p ) ); @@ -169,7 +164,7 @@ /** * Make this panel the top panel in the stack. - */ + */ inline void top() { OnError( ::top_panel( p ) ); @@ -179,7 +174,7 @@ * Make this panel the bottom panel in the stack. * N.B.: The panel associated with ::stdscr is always on the bottom. So * actually bottom() makes the panel the first above ::stdscr. - */ + */ inline void bottom() { // warning FIX for broken bottom_panel (libpanel) @@ -213,7 +208,7 @@ * need a reverse mapping from PANEL to NCursesPanel which needs some * redesign of the low level stuff. At the moment, we define them in the * interface but they will always produce an error. - */ + */ inline NCursesPanel& above() const { OnError( ERR ); @@ -238,41 +233,41 @@ int transparent( int y, int x ); - // Those two are rewrites of the corresponding virtual members of - // NCursesWindow + // Those two are rewrites of the corresponding virtual members of NCursesWindow + /** * Propagate all panel changes to the virtual screen and update the * physical screen. - */ + */ int refresh(); /** * Propagate all panel changes to the virtual screen. - */ + */ int noutrefresh(); /** * Redraw all panels. - */ + */ static void redraw(); // decorations /** * Put a frame around the panel and put the title centered in the top line * and btitle in the bottom line. - */ + */ virtual void frame( const char* title = NULL, const char* btitle = NULL ); /** * Same as frame(), but use highlighted attributes. - */ + */ virtual void boldframe( const char* title = NULL, const char* btitle = NULL ); /** * Put the title centered in the top line and btitle in the bottom line. - */ + */ virtual void label( const char* topLabel, const char* bottomLabel ); @@ -282,13 +277,13 @@ virtual void centertext( int row, const char* label ); }; + /** * @short Associate user data with a panel. * We use templates to provide a typesafe mechanism to associate * user data with a panel. A NCursesUserPanel<T> is a panel * associated with some user data of type T. -*/ - + */ template<class T> class NCursesUserPanel : public NCursesPanel { @@ -296,13 +291,13 @@ /** * This creates an user panel of the requested size with associated * user data pointed to by p_UserData. - */ + */ NCursesUserPanel( int lines, int cols, int begin_y = 0, int begin_x = 0, const T* p_UserData = ( T* )0 ) - : NCursesPanel( lines, cols, begin_y, begin_x ) + : NCursesPanel( lines, cols, begin_y, begin_x ) { if ( p ) set_user(( void * )p_UserData ); @@ -311,7 +306,7 @@ /** * This creates an user panel associated with the ::stdscr and user data * pointed to by p_UserData. - */ + */ NCursesUserPanel( const T* p_UserData = ( T* )0 ) : NCursesPanel() { if ( p ) @@ -322,7 +317,7 @@ /** * Retrieve the user data associated with the panel. - */ + */ T* UserData( void ) const { return ( T* )get_user(); @@ -330,7 +325,7 @@ /** * Associate the user panel with the user data pointed to by p_UserData. - */ + */ virtual void setUserData( const T* p_UserData ) { if ( p ) @@ -339,7 +334,7 @@ /** * Retrieve the user data if associated with the PANEL. - */ + */ static T* UserDataOf( const PANEL & pan ) { const NCursesUserPanel<T> * p = dynamic_cast( get_Panel_of( pan ) ); @@ -351,8 +346,6 @@ return ( T* )0; }; - - }; -#endif // _CURSESP_H +#endif // _NCURSESP_H Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/position.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/position.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/position.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/position.h Fri Jun 6 17:25:36 2008 @@ -15,13 +15,13 @@ Author: Michael Andres /-*/ + #ifndef position_h #define position_h #include <iosfwd> - class wpair { @@ -78,21 +78,21 @@ wpair between( const wpair & Min, const wpair & Max ) const - { - return min( max( *this, Min ), Max ); - } + { + return min( max( *this, Min ), Max ); + } static wpair min( const wpair & Lhs, const wpair & Rhs ) - { - return wpair( Lhs.A < Rhs.A ? Lhs.A : Rhs.A, - Lhs.B < Rhs.B ? Lhs.B : Rhs.B ); - } + { + return wpair( Lhs.A < Rhs.A ? Lhs.A : Rhs.A, + Lhs.B < Rhs.B ? Lhs.B : Rhs.B ); + } static wpair max( const wpair & Lhs, const wpair & Rhs ) - { - return wpair( Lhs.A > Rhs.A ? Lhs.A : Rhs.A, - Lhs.B > Rhs.B ? Lhs.B : Rhs.B ); - } + { + return wpair( Lhs.A > Rhs.A ? Lhs.A : Rhs.A, + Lhs.B > Rhs.B ? Lhs.B : Rhs.B ); + } }; @@ -211,6 +211,7 @@ bool operator!=( const wrect & Rhs ) const { return !operator==( Rhs ); } + wrect inside() const { wpos incpos( 1 ); @@ -225,6 +226,7 @@ return wrect( Pos + incpos, Sze - decsze ); } + wrect intersectRelTo( const wrect & par ) const { // Pos is relative to parent Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/stdutil.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/stdutil.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/stdutil.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/stdutil.h Fri Jun 6 17:25:36 2008 @@ -1,3 +1,21 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: stdutil.h + + Author: Michael Andres + +/-*/ + #ifndef stdutil_h #define stdutil_h @@ -10,9 +28,9 @@ #include <vector> #include <iostream> + namespace stdutil { - inline std::string vform( const char * format, va_list ap, va_list ap1 ) { char * buf = new char[vsnprintf( NULL, 0, format, ap ) + 1]; @@ -23,7 +41,7 @@ } inline std::string form( const char * format, ... ) - __attribute__(( format( printf, 1, 2 ) ) ); + __attribute__(( format( printf, 1, 2 ) ) ); inline std::string form( const char * format, ... ) { Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/stringutil.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/stringutil.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/stringutil.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/stringutil.h Fri Jun 6 17:25:36 2008 @@ -15,6 +15,7 @@ Author: Michael Andres /-*/ + #ifndef stringutil_h #define stringutil_h @@ -23,16 +24,18 @@ #include <string> #include <vector> + namespace strutil { extern unsigned split( const std::string line_tv, - std::vectorstd::string & words_Vtr, - const std::string sep_tv = " \t", - const bool singlesep_bv = false ); + std::vectorstd::string & words_Vtr, + const std::string sep_tv = " \t", + const bool singlesep_bv = false ); } // namespace strutil std::ostream & operator<<( std::ostream &, const std::wstring & ); + #endif // stringutil_h Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/tnode.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/tnode.h?rev=48120&r1=48119&r2=48120&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/tnode.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/tnode.h Fri Jun 6 17:25:36 2008 @@ -15,15 +15,14 @@ Author: Michael Andres /-*/ + #ifndef tnode_h #define tnode_h #include <iosfwd> -template <class n_value> - -class tnode +template <class n_value> class tnode { tnode & operator=( const tnode & ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org