Skip to content

Commit 9972406

Browse files
authored
Merge pull request #317 from robertsLando/patch-1
Revert breaking change value type list, #316
2 parents 9057da1 + 8670138 commit 9972406

File tree

1 file changed

+7
-19
lines changed

1 file changed

+7
-19
lines changed

src/utils.cc

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -110,26 +110,14 @@ namespace OZW {
110110
break;
111111
}
112112
case OpenZWave::ValueID::ValueType_List: {
113-
int32 val;
114-
::std::vector < ::std::string > items;
115-
::std::vector < int32> itemsvalues;
116-
117-
// populate array of all available items in the list
113+
::std::string val;
114+
::std::vector < ::std::string > items;
115+
// populate array of all available items in the list
118116
OZWManager( GetValueListItems, value, &items);
119-
OZWManager( GetValueListValues, value, &itemsvalues);
120-
121-
for (int i = 0; (unsigned)i != items.size(); i++){
122-
//items[i]=::std::to_string(itemsvalues[i])+"|"+items[i];
123-
124-
::std::stringstream sstm;
125-
sstm << itemsvalues[i] << "|" << items[i];
126-
items[i] = sstm.str();
127-
}
128-
129-
AddArrayOfStringProp(valobj, values, items);
130-
// populated selected element
131-
OZWManager( GetValueListSelection, value, &val);
132-
AddIntegerProp(valobj, value, val);
117+
AddArrayOfStringProp(valobj, values, items);
118+
// populated selected element
119+
OZWManager( GetValueListSelection, value, &val);
120+
AddStringProp(valobj, value, val.c_str())
133121
break;
134122
}
135123
case OpenZWave::ValueID::ValueType_Short: {

0 commit comments

Comments
 (0)