i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-03 01:50:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation warnings on 22.04 (Qt 5.15.3)

Browse Source
This commit is contained in:
matlabbe
2024-06-02 15:04:36 -07:00
parent 3cfcccdb1d
commit e6691658bd
5 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guilib/src/DatabaseViewer.cpp
View File

@@ -1729,7 +1729,7 @@ void DatabaseViewer::updateIds()
UINFO("Loading all IDs..."); UINFO("Loading all IDs...");
std::set<int> ids; std::set<int> ids;
dbDriver_->getAllNodeIds(ids); dbDriver_->getAllNodeIds(ids);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 3)
ids_ = QList<int>(ids.begin(), ids.end()); ids_ = QList<int>(ids.begin(), ids.end());
#else #else
ids_ = QList<int>::fromStdList(std::list<int>(ids.begin(), ids.end())); ids_ = QList<int>::fromStdList(std::list<int>(ids.begin(), ids.end()));
@@ -3960,7 +3960,7 @@ void DatabaseViewer::regenerateCurrentLocalMaps()
QSet<int> idsSet; QSet<int> idsSet;
idsSet.insert(ids_.at(ui_->horizontalSlider_A->value())); idsSet.insert(ids_.at(ui_->horizontalSlider_A->value()));
idsSet.insert(ids_.at(ui_->horizontalSlider_B->value())); idsSet.insert(ids_.at(ui_->horizontalSlider_B->value()));
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 3)
QList<int> ids(idsSet.begin(), idsSet.end()); QList<int> ids(idsSet.begin(), idsSet.end());
#else #else
QList<int> ids = idsSet.toList(); QList<int> ids = idsSet.toList();

2
guilib/src/MainWindow.cpp
View File

@@ -5078,7 +5078,7 @@ void MainWindow::drawKeypoints(const std::multimap<int, cv::KeyPoint> & refWords
_lastId = (*refWords.rbegin()).first; _lastId = (*refWords.rbegin()).first;
} }
std::list<int> kpts = uKeysList(refWords); std::list<int> kpts = uKeysList(refWords);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 3)
_lastIds = QSet<int>(kpts.begin(), kpts.end()); _lastIds = QSet<int>(kpts.begin(), kpts.end());
#else #else
_lastIds = QSet<int>::fromList(QList<int>::fromStdList(kpts)); _lastIds = QSet<int>::fromList(QList<int>::fromStdList(kpts));

3
guilib/src/ui/mainWindow.ui
View File

@@ -427,9 +427,6 @@
</widget> </widget>
<widget class="QStatusBar" name="statusbar"/> <widget class="QStatusBar" name="statusbar"/>
<widget class="QDockWidget" name="dockWidget_posterior"> <widget class="QDockWidget" name="dockWidget_posterior">
<property name="features">
<set>QDockWidget::AllDockWidgetFeatures</set>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>A posteriori PDF</string> <string>A posteriori PDF</string>
</property> </property>

2
guilib/src/ui/preferencesDialog.ui
View File

@@ -10838,7 +10838,7 @@ generate the number of words requested.</string>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="6" column="1">
<widget class="QLabel" name="label_755"> <widget class="QLabel" name="label_7551">
<property name="text"> <property name="text">
<string>If true, SSC (Suppression via Square Covering) is applied to limit keypoints.</string> <string>If true, SSC (Suppression via Square Covering) is applied to limit keypoints.</string>
</property> </property>

8
guilib/src/utilite/UPlot.cpp
View File

@@ -789,7 +789,7 @@ void UPlotCurve::draw(QPainter * painter, const QRect & limits)
{ {
QPointF intersection; QPointF intersection;
QLineF::IntersectType type; QLineF::IntersectType type;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 3)
type = lineItem->line().intersects(QLineF(limits.topLeft(), limits.bottomLeft()), &intersection); type = lineItem->line().intersects(QLineF(limits.topLeft(), limits.bottomLeft()), &intersection);
#else #else
type = lineItem->line().intersect(QLineF(limits.topLeft(), limits.bottomLeft()), &intersection); type = lineItem->line().intersect(QLineF(limits.topLeft(), limits.bottomLeft()), &intersection);
@@ -800,7 +800,7 @@ void UPlotCurve::draw(QPainter * painter, const QRect & limits)
} }
else else
{ {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 3)
type = lineItem->line().intersects(QLineF(limits.topLeft(), limits.topRight()), &intersection); type = lineItem->line().intersects(QLineF(limits.topLeft(), limits.topRight()), &intersection);
#else #else
type = lineItem->line().intersect(QLineF(limits.topLeft(), limits.topRight()), &intersection); type = lineItem->line().intersect(QLineF(limits.topLeft(), limits.topRight()), &intersection);
@@ -811,7 +811,7 @@ void UPlotCurve::draw(QPainter * painter, const QRect & limits)
} }
else else
{ {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 3)
type = lineItem->line().intersects(QLineF(limits.bottomLeft(), limits.bottomRight()), &intersection); type = lineItem->line().intersects(QLineF(limits.bottomLeft(), limits.bottomRight()), &intersection);
#else #else
type = lineItem->line().intersect(QLineF(limits.bottomLeft(), limits.bottomRight()), &intersection); type = lineItem->line().intersect(QLineF(limits.bottomLeft(), limits.bottomRight()), &intersection);
@@ -822,7 +822,7 @@ void UPlotCurve::draw(QPainter * painter, const QRect & limits)
} }
else else
{ {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 3)
type = lineItem->line().intersects(QLineF(limits.topRight(), limits.bottomRight()), &intersection); type = lineItem->line().intersects(QLineF(limits.topRight(), limits.bottomRight()), &intersection);
#else #else
type = lineItem->line().intersect(QLineF(limits.topRight(), limits.bottomRight()), &intersection); type = lineItem->line().intersect(QLineF(limits.topRight(), limits.bottomRight()), &intersection);