[yast-commit] r48083 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQMainWinDock.h src/YQWizard.cc

Author: sh-sh-sh Date: Wed Jun 4 18:07:27 2008 New Revision: 48083 URL: http://svn.opensuse.org/viewcvs/yast?rev=48083&view=rev Log: reverted last checkin (except some debug logging) Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQMainWinDock.h trunk/qt/src/YQWizard.cc Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=48083&r1=48082&r2=48083&view=diff ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Wed Jun 4 18:07:27 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "54") +SET(VERSION_PATCH "53") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=48083&r1=48082&r2=48083&view=diff ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Wed Jun 4 18:07:27 2008 @@ -1,11 +1,4 @@ ------------------------------------------------------------------- -Wed Jun 4 16:36:08 CEST 2008 - sh@suse.de - -- Prevent segfault for secondary wizards: - Call YQMainWinDock::resizeVisibleChild() indirectly via - single shot timer to avoid calling virtual methods in constructor - -------------------------------------------------------------------- Tue Jun 3 13:42:19 CEST 2008 - tgoettlicher@suse.de - limited bar width in disk usage list to 100% Modified: trunk/qt/src/YQMainWinDock.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQMainWinDock.h?rev=48083&r1=48082&r2=48083&view=diff ============================================================================== --- trunk/qt/src/YQMainWinDock.h (original) +++ trunk/qt/src/YQMainWinDock.h Wed Jun 4 18:07:27 2008 @@ -136,24 +136,21 @@ virtual void resizeEvent( QResizeEvent * event ); /** + * Resize the visible child to the current size of the dock. + **/ + void resizeVisibleChild(); + + /** * For secondary wizards **/ void setSideBarWidth( int width ); /** * Activate or deactivate the next-lower dialog in the dock when a new - * dialog is opened or when a dialog is closed. + * dialog is opened or when a dialog is closed. **/ void activateCurrentDialog( bool active ); - - -public slots: - - /** - * Resize the visible child to the current size of the dock. - **/ - void resizeVisibleChild(); - + protected slots: Modified: trunk/qt/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizard.cc?rev=48083&r1=48082&r2=48083&view=diff ============================================================================== --- trunk/qt/src/YQWizard.cc (original) +++ trunk/qt/src/YQWizard.cc Wed Jun 4 18:07:27 2008 @@ -30,7 +30,6 @@ #include <QSvgRenderer> #include <QPainter> #include <QStackedWidget> -#include <QTimer> #include #include #include @@ -75,9 +74,7 @@ #define USE_ICON_ON_HELP_BUTTON 0 - -YQWizard * YQWizard::main_wizard = 0; - +YQWizard *YQWizard::main_wizard = 0; YQWizard::YQWizard( YWidget * parent, const string & backButtonLabel, @@ -145,14 +142,9 @@ if ( !main_wizard && _stepsEnabled ) { main_wizard = this; - } - else if ( main_wizard ) + } else if ( main_wizard ) { - // Calling this in the Qt main loop, not here in the constructor: - // This will indirectly call a lot of virtual methods that are not available yet - // while this object is being constructed. - - QTimer::singleShot( 0, YQMainWinDock::mainWinDock(), SLOT( resizeVisibleChild() ) ); + YQMainWinDock::mainWinDock()->resizeVisibleChild(); } } @@ -167,13 +159,11 @@ delete _helpDlg; } - bool YQWizard::isSecondary() const { return this != main_wizard; } - void YQWizard::layoutTitleBar( QWidget * parent ) { QFrame * titleBar = new QFrame( parent ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org