stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix FormUtils compilation with swiften2

Browse source
This commit is contained in:
Jan Kaluza 2015-11-13 07:47:58 +01:00
parent d37e8afadb
commit 25b4659dd6
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/formutils.cpp
View file

@ -136,7 +136,7 @@ createTextFixedField(const std::string &value) {
#if HAVE_SWIFTEN_3
FormField::ref field = boost::make_shared<FormField>(FormField::FixedType, value);
#else
FixedFormField::ref field = FixedFormField::create(value)
FixedFormField::ref field = FixedFormField::create(value);
#endif
return field;
}
@ -170,24 +170,24 @@ std::string fieldValue(Swift::FormField::ref field) {
#if HAVE_SWIFTEN_3
return field->getValues()[0];
#else
TextSingleFormField::ref textSingle = boost::dynamic_pointer_cast<TextSingleFormField>(*it);
TextSingleFormField::ref textSingle = boost::dynamic_pointer_cast<TextSingleFormField>(field);
if (textSingle) {
return textSingle->getValue();
}
TextPrivateFormField::ref textPrivate = boost::dynamic_pointer_cast<TextPrivateFormField>(*it);
TextPrivateFormField::ref textPrivate = boost::dynamic_pointer_cast<TextPrivateFormField>(field);
if (textPrivate) {
return textPrivate->getValue();
}
ListSingleFormField::ref listSingle = boost::dynamic_pointer_cast<ListSingleFormField>(*it);
ListSingleFormField::ref listSingle = boost::dynamic_pointer_cast<ListSingleFormField>(field);
if (listSingle) {
return listSingle->getValue();
}
BooleanFormField::ref boolean = boost::dynamic_pointer_cast<BooleanFormField>(*it);
BooleanFormField::ref boolean = boost::dynamic_pointer_cast<BooleanFormField>(field);
if (boolean) {
return boolen->getValue() ? "1" : "0";
return boolean->getValue() ? "1" : "0";
}
return "";
@ -220,7 +220,7 @@ std::string fieldValue(Swift::Form::ref form, const std::string &key, const std:
BooleanFormField::ref boolean = boost::dynamic_pointer_cast<BooleanFormField>(*it);
if (boolean && boolean->getName() == key) {
return boolen->getValue() ? "1" : "0";
return boolean->getValue() ? "1" : "0";
}
#endif
}

3
src/settingsadhoccommand.cpp
View file

@ -58,9 +58,6 @@ boost::shared_ptr<Swift::Command> SettingsAdHocCommand::getForm() {
return response;
}
boost::shared_ptr<Swift::Command> response(new Swift::Command("settings", m_id, Swift::Command::Executing));
boost::shared_ptr<Swift::Form> form(new Swift::Form());
std::string value;
int type = (int) TYPE_BOOLEAN;