Author: aschnell
Date: Thu Apr 12 17:16:53 2012
New Revision: 67929
URL: http://svn.opensuse.org/viewcvs/yast?rev=67929&view=rev
Log:
- don't use deprecated YCPMapIterator
Modified:
trunk/ycp-ui-bindings/src/YCPDialogParser.cc
trunk/ycp-ui-bindings/src/YCP_UI.cc
Modified: trunk/ycp-ui-bindings/src/YCPDialogParser.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPDialogParser.cc?rev=67929&r1=67928&r2=67929&view=diff
==============================================================================
--- trunk/ycp-ui-bindings/src/YCPDialogParser.cc (original)
+++ trunk/ycp-ui-bindings/src/YCPDialogParser.cc Thu Apr 12 17:16:53 2012
@@ -3498,8 +3498,8 @@
string pixmap = term->value( argnr )->asString()->value();
map zones;
YCPMap secondArg = term->value( argnr+1 )->asMap();
- for ( YCPMapIterator it = secondArg.begin(); it != secondArg.end(); ++it )
- zones[ it.key()->asString()->value() ] = it.value()->asString()->value();
+ for ( YCPMap::const_iterator it = secondArg.begin(); it != secondArg.end(); ++it )
+ zones[ it->first->asString()->value() ] = it->second->asString()->value();
YTimezoneSelector * selector = YUI::optionalWidgetFactory()->createTimezoneSelector( parent, pixmap, zones );
Modified: trunk/ycp-ui-bindings/src/YCP_UI.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCP_UI.cc?rev=67929&r1=67928&r2=67929&view=diff
==============================================================================
--- trunk/ycp-ui-bindings/src/YCP_UI.cc (original)
+++ trunk/ycp-ui-bindings/src/YCP_UI.cc Thu Apr 12 17:16:53 2012
@@ -1512,12 +1512,12 @@
*/
void YCP_UI::SetFunctionKeys( const YCPMap & new_fkeys )
{
- for ( YCPMapIterator it = new_fkeys->begin(); it != new_fkeys->end(); ++it )
+ for ( YCPMap::const_iterator it = new_fkeys->begin(); it != new_fkeys->end(); ++it )
{
- if ( it.key()->isString() && it.value()->isInteger() )
+ if ( it->first->isString() && it->second->isInteger() )
{
- string label = YShortcut::cleanShortcutString( it.key()->asString()->value() );
- int fkey = it.value()->asInteger()->value();
+ string label = YShortcut::cleanShortcutString( it->first->asString()->value() );
+ int fkey = it->second->asInteger()->value();
if ( fkey > 0 && fkey <= 24 )
{
@@ -1534,7 +1534,7 @@
{
ycperror( "SetFunctionKeys(): Invalid map element: "
"Expected <string>: <integer>, not %s: %s",
- it.key()->toString().c_str(), it.value()->toString().c_str() );
+ it->first->toString().c_str(), it->second->toString().c_str() );
}
}
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
