Author: coolo Date: Wed Nov 28 08:57:41 2007 New Revision: 42469 URL: http://svn.opensuse.org/viewcvs/yast?rev=42469&view=rev Log: make it compile after the merge Modified: branches/tmp/coolo/qt4-port/src/CMakeLists.txt branches/tmp/coolo/qt4-port/src/YQWizard.cc Modified: branches/tmp/coolo/qt4-port/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/CMakeLists.txt?rev=42469&r1=42468&r2=42469&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/CMakeLists.txt (original) +++ branches/tmp/coolo/qt4-port/src/CMakeLists.txt Wed Nov 28 08:57:41 2007 @@ -54,3 +54,4 @@ #SET_TARGET_PROPERTIES( y2lang_qt4 PROPERTIES PREFIX "" ) + Modified: branches/tmp/coolo/qt4-port/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWizard.cc?rev=42469&r1=42468&r2=42469&view=diff ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWizard.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQWizard.cc Wed Nov 28 08:57:41 2007 @@ -415,7 +415,7 @@ return; } - if ( _stepsList.last() && _stepsList.last()->name() == text ) + if ( _stepsList.last() && _stepsList.last()->name() == fromUTF8( text ) ) { // Consecutive steps with the same name will be shown as one single step. // @@ -438,7 +438,7 @@ void YQWizard::addStepHeading( const string & text ) { - _stepsList.append( new YQWizard::StepHeading( text ) ); + _stepsList.append( new YQWizard::StepHeading( fromUTF8( text ) ) ); _stepsDirty = true; } @@ -651,7 +651,7 @@ void YQWizard::setCurrentStep( const string & id ) { - _currentStepID = id; + _currentStepID = fromUTF8( id ); updateStepStates(); } @@ -1626,7 +1626,7 @@ { int id = _menuEntryIDs.size(); _menuEntryIDs.push_back( idString ); - parentMenu->insertItem( text, id ); + parentMenu->insertItem( fromUTF8( text ), id ); } else { @@ -1666,7 +1666,7 @@ { if ( numID >= 0 && numID < (int) _menuEntryIDs.size() ) { - sendEvent( toUTF8( _menuEntryIDs[ numID ] ) ); + sendEvent( _menuEntryIDs[ numID ] ); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org