rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-14 06:29:18 +01:00
Code Issues Releases Activity

OP-1170 Got rid of all compiler warnings in opmap plugin.

Browse Source
This commit is contained in:
m_thread 2014-02-26 17:48:40 +01:00
parent 7e52a0f641
commit a79efd7353
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ground/openpilotgcs/src/plugins/opmap/modelmapproxy.cpp
View File

@ -91,20 +91,13 @@ modelMapProxy::overlayType modelMapProxy::overlayTranslate(int type)
case MapDataDelegate::MODE_DRIVEENDPOINT: case MapDataDelegate::MODE_DRIVEENDPOINT:
case MapDataDelegate::MODE_DRIVEVECTOR: case MapDataDelegate::MODE_DRIVEVECTOR:
return OVERLAY_LINE; return OVERLAY_LINE;
break;
case MapDataDelegate::MODE_FLYCIRCLERIGHT: case MapDataDelegate::MODE_FLYCIRCLERIGHT:
case MapDataDelegate::MODE_DRIVECIRCLERIGHT: case MapDataDelegate::MODE_DRIVECIRCLERIGHT:
return OVERLAY_CIRCLE_RIGHT; return OVERLAY_CIRCLE_RIGHT;
break;
case MapDataDelegate::MODE_FLYCIRCLELEFT: case MapDataDelegate::MODE_FLYCIRCLELEFT:
case MapDataDelegate::MODE_DRIVECIRCLELEFT: case MapDataDelegate::MODE_DRIVECIRCLELEFT:
return OVERLAY_CIRCLE_LEFT;
break;
default: default:
break; return OVERLAY_CIRCLE_LEFT;
} }
} }
@ -297,6 +290,10 @@ void modelMapProxy::dataChanged(const QModelIndex &topLeft, const QModelIndex &b
void modelMapProxy::rowsInserted(const QModelIndex &parent, int first, int last) void modelMapProxy::rowsInserted(const QModelIndex &parent, int first, int last)
{ {
Q_UNUSED(parent); Q_UNUSED(parent);
Q_UNUSED(first);
Q_UNUSED(last);
/*
for (int x = first; x < last + 1; x++) { for (int x = first; x < last + 1; x++) {
QModelIndex index; QModelIndex index;
WayPointItem *item; WayPointItem *item;
@ -326,6 +323,7 @@ void modelMapProxy::rowsInserted(const QModelIndex &parent, int first, int last)
item = myMap->WPInsert(latlng, altitude, desc, x); item = myMap->WPInsert(latlng, altitude, desc, x);
} }
} }
*/
refreshOverlays(); refreshOverlays();
} }
void modelMapProxy::deleteWayPoint(int number) void modelMapProxy::deleteWayPoint(int number)

2
ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.h
View File

@ -51,10 +51,10 @@ public:
void editWaypoint(mapcontrol::WayPointItem *waypoint_item); void editWaypoint(mapcontrol::WayPointItem *waypoint_item);
private: private:
Ui::opmap_edit_waypoint_dialog *ui;
QDataWidgetMapper *mapper; QDataWidgetMapper *mapper;
QAbstractItemModel *model; QAbstractItemModel *model;
QItemSelectionModel *itemSelection; QItemSelectionModel *itemSelection;
Ui::opmap_edit_waypoint_dialog *ui;
private slots: private slots:
private slots: private slots:

7
ground/openpilotgcs/src/plugins/opmap/opmapgadgetoptionspage.ui
View File

@ -490,13 +490,6 @@
</spacer> </spacer>
</item> </item>
</layout> </layout>
<zorder></zorder>
<zorder></zorder>
<zorder></zorder>
<zorder></zorder>
<zorder>verticalSpacer</zorder>
<zorder>line</zorder>
<zorder>label_7</zorder>
</widget> </widget>
</widget> </widget>
</item> </item>