rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

LP-467 cleanup class and enum names (should start with capital letter)

Browse Source
This commit is contained in:
Philippe Renon 2017-01-15 12:40:04 +01:00
parent e8277597a4
commit 9b928c075d
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ground/gcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
View File

@ -647,8 +647,8 @@ void ConfigTaskWidget::addAutoBindings()
QVariant info = widget->property("objrelation");
if (info.isValid()) {
bindingStruct uiRelation;
uiRelation.buttonType = none;
BindingStruct uiRelation;
uiRelation.buttonType = None;
uiRelation.scale = 1;
uiRelation.index = -1;
uiRelation.elementName = QString();
@ -679,15 +679,15 @@ void ConfigTaskWidget::addAutoBindings()
}
} else if (prop == "button") {
if (value == "save") {
uiRelation.buttonType = save_button;
uiRelation.buttonType = SaveButton;
} else if (value == "apply") {
uiRelation.buttonType = apply_button;
uiRelation.buttonType = ApplyButton;
} else if (value == "reload") {
uiRelation.buttonType = reload_button;
uiRelation.buttonType = ReloadButton;
} else if (value == "default") {
uiRelation.buttonType = default_button;
uiRelation.buttonType = DefaultButton;
} else if (value == "help") {
uiRelation.buttonType = help_button;
uiRelation.buttonType = HelpButton;
}
} else if (prop == "buttongroup") {
foreach(QString s, value.split(",")) {
@ -697,34 +697,34 @@ void ConfigTaskWidget::addAutoBindings()
uiRelation.url = str.mid(str.indexOf(":") + 1);
}
}
if (uiRelation.buttonType != none) {
if (uiRelation.buttonType != None) {
QPushButton *button = NULL;
switch (uiRelation.buttonType) {
case save_button:
case SaveButton:
button = qobject_cast<QPushButton *>(widget);
if (button) {
addSaveButton(button);
}
break;
case apply_button:
case ApplyButton:
button = qobject_cast<QPushButton *>(widget);
if (button) {
addApplyButton(button);
}
break;
case default_button:
case DefaultButton:
button = qobject_cast<QPushButton *>(widget);
if (button) {
addDefaultButton(button, uiRelation.buttonGroup.at(0));
}
break;
case reload_button:
case ReloadButton:
button = qobject_cast<QPushButton *>(widget);
if (button) {
addReloadButton(button, uiRelation.buttonGroup.at(0));
}
break;
case help_button:
case HelpButton:
button = qobject_cast<QPushButton *>(widget);
if (button) {
addHelpButton(button, WIKI_URL_ROOT + m_wikiURL);
@ -839,10 +839,10 @@ void ConfigTaskWidget::reloadButtonClicked()
connect(m_realtimeUpdateTimer, SIGNAL(timeout()), eventLoop, SLOT(quit()));
connect(objper, SIGNAL(objectUpdated(UAVObject *)), eventLoop, SLOT(quit()));
QList<objectComparator> temp;
QList<ObjectComparator> temp;
foreach(WidgetBinding * binding, bindings) {
if (binding->isEnabled() && binding->object()) {
objectComparator value;
ObjectComparator value;
value.objid = binding->object()->getObjID();
value.objinstid = binding->object()->getInstID();
if (temp.contains(value)) {

10
ground/gcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h
View File

@ -211,23 +211,23 @@ private slots:
void helpButtonPressed();
private:
struct objectComparator {
struct ObjectComparator {
quint32 objid;
quint32 objinstid;
bool operator==(const objectComparator & lhs)
bool operator==(const ObjectComparator & lhs)
{
return lhs.objid == this->objid && lhs.objinstid == this->objinstid;
}
};
enum buttonTypeEnum { none, save_button, apply_button, reload_button, default_button, help_button };
struct bindingStruct {
enum ButtonTypeEnum { None, SaveButton, ApplyButton, ReloadButton, DefaultButton, HelpButton };
struct BindingStruct {
QString objectName;
QString fieldName;
QString elementName;
int index;
QString url;
buttonTypeEnum buttonType;
ButtonTypeEnum buttonType;
QList<int> buttonGroup;
double scale;
bool haslimits;