From a12823e8206999b2c9575b429f4588cfbccd7a3c Mon Sep 17 00:00:00 2001
From: coolo <coolo@e0cc52ee-31ee-0310-8b87-e83c4596d67c>
Date: Wed, 28 Nov 2007 07:57:41 +0000
Subject: [PATCH] make it compile after the merge

git-svn-id: http://svn.opensuse.org/svn/yast/branches/tmp/coolo/qt4-port@42469 e0cc52ee-31ee-0310-8b87-e83c4596d67c
---
 src/CMakeLists.txt |  1 +
 src/YQWizard.cc    | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f818c59..d223b25 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -54,3 +54,4 @@ INSTALL(TARGETS py2qt4 LIBRARY DESTINATION ${YAST_PLUGIN_DIR} )
 
 
 #SET_TARGET_PROPERTIES( y2lang_qt4 PROPERTIES PREFIX "" )
+
diff --git a/src/YQWizard.cc b/src/YQWizard.cc
index 69af653..54ae811 100644
--- a/src/YQWizard.cc
+++ b/src/YQWizard.cc
@@ -415,7 +415,7 @@ void YQWizard::addStep( const string & text, const string & id )
 	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::addStep( const string & text, const string & id )
 
 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::setStepStatus( YQWizard::Step * step, const QPixmap & icon, const
 
 void YQWizard::setCurrentStep( const string & id )
 {
-    _currentStepID = id;
+    _currentStepID = fromUTF8( id );
     updateStepStates();
 }
 
@@ -1626,7 +1626,7 @@ void YQWizard::addMenuEntry( const string & parentMenuID,
     {
 	int id = _menuEntryIDs.size();
 	_menuEntryIDs.push_back( idString );
-	parentMenu->insertItem( text, id );
+	parentMenu->insertItem( fromUTF8( text ), id );
     }
     else
     {
@@ -1666,7 +1666,7 @@ void YQWizard::sendMenuEvent( int numID )
 {
     if ( numID >= 0 && numID < (int) _menuEntryIDs.size() )
     {
-	sendEvent( toUTF8( _menuEntryIDs[ numID ] ) );
+	sendEvent( _menuEntryIDs[ numID ] );
     }
     else
     {
-- 
2.39.2