Author: sh-sh-sh Date: Tue Dec 11 18:25:00 2007 New Revision: 42982 URL: http://svn.opensuse.org/viewcvs/yast?rev=42982&view=rev Log: Fixed byproduct of fix for bug #346158 and bug #346165: All YSimpleEvents returned strings now, even predefined IDs `cancel, `timeout, `debugConsole; now returning correct IDs again Modified: trunk/core/libyui/doc/examples/TimeoutUserInput.ycp trunk/core/libyui/src/YEvent.h trunk/core/package/yast2-core.changes Modified: trunk/core/libyui/doc/examples/TimeoutUserInput.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/doc/examples/TimeoutUserInput.ycp?rev=42982&r1=42981&r2=42982&view=diff ============================================================================== --- trunk/core/libyui/doc/examples/TimeoutUserInput.ycp (original) +++ trunk/core/libyui/doc/examples/TimeoutUserInput.ycp Tue Dec 11 18:25:00 2007 @@ -25,7 +25,7 @@ { id = UI::TimeoutUserInput( interval_millisec ); - if ( id == "timeout" ) + if ( id == `timeout ) { // Periodic screen update Modified: trunk/core/libyui/src/YEvent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YEvent.h?rev=42982&r1=42981&r2=42982&view=diff ============================================================================== --- trunk/core/libyui/src/YEvent.h (original) +++ trunk/core/libyui/src/YEvent.h Tue Dec 11 18:25:00 2007 @@ -38,7 +38,7 @@ class YEvent { public: - + enum EventType { NoEvent = 0, @@ -59,7 +59,7 @@ SelectionChanged, ValueChanged }; - + /** * Constructor. @@ -68,7 +68,7 @@ /** * Virtual desctructor to force a polymorph object - * so dynamic_cast can be used + * so dynamic_cast can be used **/ virtual ~YEvent(); @@ -87,12 +87,12 @@ * Returns the character representation of an event type. **/ static const char * toString( EventType eventType ); - + /** * Returns the character representation of an event reason. **/ static const char * toString( EventReason reason ); - + /** * Constructs a YCP map to be returned upon UI::WaitForEvent(). **/ @@ -107,12 +107,12 @@ **/ virtual YCPValue userInput(); - + protected: EventType _eventType; unsigned long _serial; - + static unsigned long _nextSerial; static int _activeEvents; }; @@ -122,12 +122,12 @@ class YWidgetEvent: public YEvent { public: - + /** * Constructor. **/ YWidgetEvent( YWidget * widget = 0, - EventReason reason = Activated, + EventReason reason = Activated, EventType eventType = WidgetEvent ); /** @@ -155,7 +155,7 @@ * Reimplemented from YEvent. **/ virtual YCPValue userInput(); - + protected: YWidget * _widget; @@ -166,7 +166,7 @@ class YKeyEvent: public YEvent { public: - + /** * Constructor. * @@ -186,7 +186,7 @@ /** * Returns the widget that currently has the keyboard focus. * - * This might as well be 0 if no widget has the focus or if the creator of + * This might as well be 0 if no widget has the focus or if the creator of * this event could not obtain that information. **/ YWidget * focusWidget() const { return _focusWidget; } @@ -205,7 +205,7 @@ * Reimplemented from YEvent. **/ virtual YCPValue userInput(); - + protected: string _keySymbol; @@ -219,7 +219,7 @@ class YSimpleEvent: public YEvent { public: - + /** * Constructors. **/ @@ -247,7 +247,7 @@ **/ virtual YCPValue userInput(); - + protected: YCPValue _id; @@ -260,12 +260,12 @@ class YMenuEvent: public YSimpleEvent { public: - + YMenuEvent( YItem * item ) : YSimpleEvent( MenuEvent, YCPVoid() ), _item( item ) {} - + YMenuEvent( const YCPValue & id ) : YSimpleEvent( MenuEvent, id ), _item(0) {} YMenuEvent( const char * id ) : YSimpleEvent( MenuEvent, id ), _item(0) {} YMenuEvent( const string & id ) : YSimpleEvent( MenuEvent, id ), _item(0) {} @@ -290,8 +290,8 @@ class YCancelEvent: public YSimpleEvent { public: - - YCancelEvent() : YSimpleEvent( CancelEvent, "cancel" ) {} + + YCancelEvent() : YSimpleEvent( CancelEvent, YCPSymbol( "cancel" ) ) {} }; @@ -302,8 +302,8 @@ class YDebugEvent: public YSimpleEvent { public: - - YDebugEvent() : YSimpleEvent( DebugEvent, "debugHotkey" ) {} + + YDebugEvent() : YSimpleEvent( DebugEvent, YCPSymbol( "debugHotkey" ) ) {} }; @@ -314,8 +314,8 @@ class YTimeoutEvent: public YSimpleEvent { public: - - YTimeoutEvent() : YSimpleEvent( TimeoutEvent, "timeout" ) {} + + YTimeoutEvent() : YSimpleEvent( TimeoutEvent, YCPSymbol( "timeout" ) ) {} }; Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?rev=42982&r1=42981&r2=42982&view=diff ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Tue Dec 11 18:25:00 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Dec 11 18:22:22 CET 2007 - sh@suse.de + +- Fixed byproduct of fix for bug #346158 and bug #346165: + All YSimpleEvents returned strings now, even predefined IDs + `cancel, `timeout, `debugConsole; now returning correct IDs again + +------------------------------------------------------------------- Mon Dec 10 18:35:12 CET 2007 - sh@suse.de - Moved file and directory dialogs from YUI to YApplication: -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org