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

Author: sh-sh-sh Date: Fri Jun 6 18:54:40 2008 New Revision: 48136 URL: http://svn.opensuse.org/viewcvs/yast?rev=48136&view=rev Log: consistentcy + removed cruft Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAskForDirectory.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCImage.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/NCPackageSelectorPluginIf.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPad.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/NCPopupTable.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/NCRichText.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/NCTable.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/NCstring.h branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtext.h branches/tmp/sh/ncurses-cleanup/ncurses/src/tnode.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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAskForDirectory.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCAskForDirectory.h Fri Jun 6 18:54:40 2008 @@ -35,12 +35,11 @@ class NCAskForExistingDirectory : public NCPopup { +private: NCAskForExistingDirectory & operator=( const NCAskForExistingDirectory & ); NCAskForExistingDirectory( const NCAskForExistingDirectory & ); -private: - NCPushButton * okButton; NCPushButton * cancelButton; NCComboBox * dirName; @@ -80,5 +79,4 @@ }; - #endif // NCAskForExistingDirectory_h 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.h Fri Jun 6 18:54:40 2008 @@ -33,6 +33,7 @@ class NCDialog : public YDialog, public NCWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCDialog & OBJ ); friend std::ostream & operator<<( std::ostream & STREAM, const NCDialog * OBJ ); @@ -40,8 +41,6 @@ NCDialog & operator=( const NCDialog & ); NCDialog( const NCDialog & ); -private: - typedef tnode * ( tnode::* SeekDir )( const bool ); NCWidget & GetNormal( NCWidget & startwith, SeekDir Direction ); @@ -74,8 +73,6 @@ NCursesEvent getInputEvent( wint_t ch ); NCursesEvent getHotkeyEvent( wint_t key ); -private: - void grabActive( NCWidget * nactive ); virtual void grabNotify( NCWidget * mgrab ); virtual bool wantFocus( NCWidget & ngrab ); 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCImage.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCImage.h Fri Jun 6 18:54:40 2008 @@ -29,13 +29,13 @@ class NCImage : public YImage, public NCWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCImage & OBJ ); NCImage & operator=( const NCImage & ); NCImage( const NCImage & ); -private: NClabel label; 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMenuButton.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMenuButton.h Fri Jun 6 18:54:40 2008 @@ -30,14 +30,13 @@ class NCMenuButton : public YMenuButton, public NCWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCMenuButton & OBJ ); NCMenuButton & operator=( const NCMenuButton & ); NCMenuButton( const NCMenuButton & ); -private: - NClabel label; bool haveUtf8() { return YUI::app()->hasFullUtf8Support(); } 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMultiLineEdit.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCMultiLineEdit.h Fri Jun 6 18:54:40 2008 @@ -30,14 +30,12 @@ class NCMultiLineEdit : public YMultiLineEdit, public NCPadWidget { - +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCMultiLineEdit & OBJ ); NCMultiLineEdit & operator=( const NCMultiLineEdit & ); NCMultiLineEdit( const NCMultiLineEdit & ); -private: - NCstring ctext; 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPackageSelectorPluginIf.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPackageSelectorPluginIf.h Fri Jun 6 18:54:40 2008 @@ -36,7 +36,6 @@ virtual YEvent *runPkgSelection( YDialog *currentDialog, YWidget *packageSelector ) = 0; virtual YWidget *createPkgSpecial( YWidget *parent, const string &subwidget ) = 0; - }; 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPad.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPad.h Fri Jun 6 18:54:40 2008 @@ -27,7 +27,6 @@ class NCSchrollCB { - public: virtual ~NCSchrollCB() {} @@ -44,7 +43,6 @@ class NCScrollHint : protected NCSchrollCB { - private: NCSchrollCB * redirect; 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopup.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopup.h Fri Jun 6 18:54:40 2008 @@ -56,6 +56,7 @@ }; + #endif // NCPopup_h 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupInfo.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupInfo.h Fri Jun 6 18:54:40 2008 @@ -41,11 +41,11 @@ class NCPopupInfo : public NCPopup { +private: NCPopupInfo & operator=( const NCPopupInfo & ); NCPopupInfo( const NCPopupInfo & ); -private: NCRichText * helpText; NCPushButton * okButton; 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupTable.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupTable.h Fri Jun 6 18:54:40 2008 @@ -35,12 +35,11 @@ class NCPopupTable : public NCPopup { +private: NCPopupTable & operator=( const NCPopupTable & ); NCPopupTable( const NCPopupTable & ); -private: - NCTable * sellist; protected: 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRadioButton.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRadioButton.h Fri Jun 6 18:54:40 2008 @@ -29,14 +29,13 @@ class NCRadioButton : public YRadioButton, public NCWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCRadioButton & OBJ ); NCRadioButton & operator=( const NCRadioButton & ); NCRadioButton( const NCRadioButton & ); -private: - bool checked; NClabel label; 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRadioButtonGroup.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRadioButtonGroup.h Fri Jun 6 18:54:40 2008 @@ -30,13 +30,13 @@ class NCRadioButtonGroup : public YRadioButtonGroup, public NCWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCRadioButtonGroup & OBJ ); NCRadioButtonGroup & operator=( const NCRadioButtonGroup & ); NCRadioButtonGroup( const NCRadioButtonGroup & ); -private: int focusId; protected: 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRichText.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCRichText.h Fri Jun 6 18:54:40 2008 @@ -33,17 +33,16 @@ class NCRichText : public YRichText, public NCPadWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCRichText & OBJ ); NCRichText & operator=( const NCRichText & ); NCRichText( const NCRichText & ); -private: - /** * Lookup map for character entities (e.g. '>'). Initialized - * and used by @ref entityLookup. + * and used by entityLookup. **/ static std::map _charentity; 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSpacing.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSpacing.h Fri Jun 6 18:54:40 2008 @@ -27,9 +27,6 @@ #include "NCWidget.h" -class NCSpacing; - - class NCSpacing : public YSpacing, public NCWidget { 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSquash.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCSquash.h Fri Jun 6 18:54:40 2008 @@ -24,8 +24,6 @@ #include "YSquash.h" #include "NCWidget.h" -class NCSquash; - class NCSquash : public YSquash, public NCWidget { Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTable.h?rev=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTable.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTable.h Fri Jun 6 18:54:40 2008 @@ -22,12 +22,9 @@ #include <iosfwd> #include "YTable.h" - #include "NCPadWidget.h" #include "NCTablePad.h" -class NCTable; - class NCTable : public YTable, public NCPadWidget { 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTree.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTree.h Fri Jun 6 18:54:40 2008 @@ -30,12 +30,12 @@ class NCTree : public YTree, public NCPadWidget { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCTree & OBJ ); NCTree & operator=( const NCTree & ); NCTree( const NCTree & ); -private: void CreateTreeLines( NCTreeLine * p, NCTreePad * pad, YItem * item ); protected: @@ -46,17 +46,12 @@ const NCTreeLine * getTreeLine( unsigned idx ) const; NCTreeLine * modifyTreeLine( unsigned idx ); -protected: - virtual const char * location() const { return "NCTree"; } virtual NCPad * CreatePad(); virtual void DrawPad(); -protected: - virtual void startMultipleChanges() { startMultidraw(); } - virtual void doneMultipleChanges() { stopMultidraw(); } public: 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTreePad.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCTreePad.h Fri Jun 6 18:54:40 2008 @@ -34,13 +34,13 @@ class NCTreePad : public NCPad { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCTreePad & OBJ ); NCTreePad & operator=( const NCTreePad & ); NCTreePad( const NCTreePad & ); -private: NCursesPad Headpad; bool dirtyHead; 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCWidget.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCWidget.h Fri Jun 6 18:54:40 2008 @@ -37,6 +37,7 @@ class NCWidget : public tnode, protected NCursesError { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCWidget & OBJ ); friend std::ostream & operator<<( std::ostream & STREAM, const NCWidget * OBJ ); @@ -44,7 +45,6 @@ NCWidget & operator=( const NCWidget & ); NCWidget( const NCWidget & ); -private: /** * Make this widget invalid. This operation cannot be reversed. @@ -60,8 +60,6 @@ virtual const char * location() const { return "NCWidget"; } -protected: - virtual void PreDisconnect(); virtual void PostDisconnect(); virtual void PreReparent(); @@ -69,8 +67,6 @@ NCursesWindow * ParentWin(); -protected: - NCWidget *const grabedBy; bool grabFocus(); virtual void grabNotify( NCWidget * ) {} @@ -118,15 +114,11 @@ wpos ScreenPos() const; -protected: - NC::WState wstate; virtual void wRedraw(); virtual void wRecoded(); -protected: - NClabel * hotlabel; public: 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstring.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCstring.h Fri Jun 6 18:54:40 2008 @@ -28,10 +28,10 @@ class NCstring { +private: friend std::ostream & operator<<( std::ostream & STREAM, const NCstring & OBJ ); -private: mutable wchar_t hotk; // hotkey mutable wstring::size_type hotp; // position of hotkey 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtext.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCtext.h Fri Jun 6 18:54:40 2008 @@ -98,8 +98,6 @@ virtual ~NClabel() {} -public: - size_t width() const { return Columns(); } unsigned height() const { return Lines(); } 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=48136&r1=48135&r2=48136&view=diff ============================================================================== --- branches/tmp/sh/ncurses-cleanup/ncurses/src/tnode.h (original) +++ branches/tmp/sh/ncurses-cleanup/ncurses/src/tnode.h Fri Jun 6 18:54:40 2008 @@ -42,7 +42,6 @@ self * fchild; self * lchild; -private: bool DoReparentTo( self & p, self * s, const bool behind ) { @@ -150,7 +149,6 @@ Disconnect(); } -public: void Disconnect() { @@ -185,8 +183,6 @@ } -public: - n_value & Value() const { return val; } n_value & operator()() const { return Value(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org