Author: aschnell Date: Fri Feb 10 11:35:10 2012 New Revision: 67402 URL: http://svn.opensuse.org/viewcvs/yast?rev=67402&view=rev Log: - removed some unneeded casts Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67402&r1=67401&r2=67402&view=diff ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Feb 10 11:35:10 2012 @@ -80,7 +80,7 @@ if (Mode::config ()) { - items = (list<term>) maplist (integer k, map<string,any> d, devices, { + items = maplist (integer k, map<string,any> d, devices, { string channel = d["channel_id"]:""; string diag = d["diag"]:false // table cell @@ -92,12 +92,12 @@ ? _("Yes") // table cell : _("No"); - return `item (`id (k), channel, format, diag); + return `item (`id(k), channel, format, diag); }); - return items; } - - items = (list<term>) maplist (integer k, map<string,any> d, devices, ``{ + else + { + items = maplist(integer k, map<string, any> d, devices, { boolean active = (boolean)(d["resource", "io", 0, "active"]:false); integer channel = (integer)(d["resource", "io", 0, "start"]:0); string str_channel = (string)(d["channel"]:""); @@ -133,14 +133,14 @@ // table cell : _("No"); string partition_info = d["partition_info"]:"--"; - boolean activate = d["activate"]:false; string selected = DASDController::selected[k]:false // table cell ? _("Yes") : "-"; - if (!active) { + if (!active) + { type = "--"; access = "--"; formatted = "--"; @@ -148,13 +148,11 @@ device = "--"; } - term t = `item (`id (k), selected, str_channel, device, - type ,access); - t = add (t, diag); - t = add (t, formatted); - t = add (t, partition_info); - return t; + return `item(`id(k), selected, str_channel, device, type, access, diag, formatted, + partition_info); }); + } + return items; } Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67402&r1=67401&r2=67402&view=diff ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 10 11:35:10 2012 @@ -57,7 +57,7 @@ list<term> items = []; - items = (list<term>) maplist (integer k, map<string,any> d, devices, ``{ + items = maplist(integer k, map<string, any> d, devices, { string dev_name = (string)(d["dev_name"]:""); string channel = d["detail", "controller_id"]:"unknown"; string wwpn = d["detail", "wwpn"]:"unknown"; @@ -69,9 +69,9 @@ ? _("Yes") : "-"; - term t = `item (`id (k), channel, wwpn, fcp_lun); - return t; + return `item(`id(k), channel, wwpn, fcp_lun); }); + return items; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org